From 1b5162ebb83ffc13e5c196ccd135ae5f98701edd Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 12 七月 2024 18:09:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java b/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java
index 81be8aa..3d4423e 100644
--- a/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java
+++ b/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java
@@ -1,13 +1,11 @@
package com.mindskip.xzs.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.mindskip.xzs.base.BasePage;
-import com.mindskip.xzs.domain.ExamTemplates;
-import com.mindskip.xzs.domain.ExamTemplatesSubject;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
-import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -15,16 +13,39 @@
public class ExamTemplatesVO extends BasePage implements Serializable {
private Integer id;
+
private String name;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ctime;
+
private LocalDateTime now;
+
private Integer[] subjectId;
+
+ /** 璇剧洰鍚嶅瓧 */
+ private String subjectNames;
+
private String status;
+
private Integer userId;
/**
* 閮ㄩ棬ID
*/
- private Integer deptId;
+ private List<Integer> deptId;
+
+ private List<Integer> userIds;
+
+ private List<Integer> paperIds;
+
+ private String createDepartment;
+
+ private Integer createUser;
+
+ /**
+ * 鏃堕棿鍛ㄦ湡
+ */
+ private List<LocalDateTime> period;
}
--
Gitblit v1.8.0