From 126c774854a74f02e5deaee308a7688e0f171aaa Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 09 七月 2024 17:37:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/domain/vo/admin/exam/QuestionImportVO.java | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/QuestionImportVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/QuestionImportVO.java
index 0275355..966ccc8 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/QuestionImportVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/QuestionImportVO.java
@@ -9,8 +9,6 @@
import lombok.Data;
import org.springframework.util.StringUtils;
-import java.util.List;
-
/**
* @author gonghl
* @since 2024-7-4
@@ -20,19 +18,11 @@
@ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER)
public class QuestionImportVO {
- @ExcelProperty("鏍囬")
- private String label;
-
@ExcelProperty("棰樼洰绫诲瀷")
private String questionType;
@ExcelProperty("绉戠洰")
private String subject;
-
- @ExcelIgnore
- private List<Integer> subjectIds;
- @ExcelIgnore
- private List<String> subjectList;
@ColumnWidth(80)
@ExcelProperty("棰樺共")
@@ -68,10 +58,6 @@
/**
* 杩斿洖璇ユ潯鏁版嵁鏄笉鏄锛屽洜涓鸿繕鏈夐�夐」銆傞�夐」鐨勮繖浜涘�兼槸绌虹殑
*/
- public boolean master() {
- return StringUtils.hasText(questionType) && StringUtils.hasText(label);
- }
-
public boolean intact() {
return StringUtils.hasText(title) && StringUtils.hasText(correct);
}
--
Gitblit v1.8.0