From fc36338476ccb0e8fa641794de4022f300f59a2e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 13:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/vo/QuestionExportVO.java | 25 +++----------------------
1 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/vo/QuestionExportVO.java b/src/main/java/com/mindskip/xzs/vo/QuestionExportVO.java
index b3a8c13..0b82070 100644
--- a/src/main/java/com/mindskip/xzs/vo/QuestionExportVO.java
+++ b/src/main/java/com/mindskip/xzs/vo/QuestionExportVO.java
@@ -6,6 +6,7 @@
import org.springframework.util.StringUtils;
import java.util.Date;
+import java.util.List;
/**
* @author锛歺p
@@ -15,29 +16,9 @@
public class QuestionExportVO {
/**
- * 棰樺瀷
+ * 璇剧洰
*/
- private Integer questionType;
+ private List<Integer> subjectIds;
- /**
- * 寮�濮嬫椂闂�
- */
- private String startStr;
- private Date start;
-
- /**
- * 缁撴潫鏃堕棿
- */
- private String endStr;
- private Date end;
-
- public void formartTime() {
- if (StringUtils.hasText(startStr)) {
- start = DateTimeUtil.parse(startStr, "yyyy-MM-dd HH:mm:ss");
- }
- if (StringUtils.hasText(endStr)) {
- end = DateTimeUtil.parse(endStr, "yyyy-MM-dd HH:mm:ss");
- }
- }
}
--
Gitblit v1.8.0