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 | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 af34bd1..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,5 +1,6 @@
package com.mindskip.xzs.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.mindskip.xzs.base.BasePage;
import lombok.Data;
@@ -15,6 +16,7 @@
private String name;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ctime;
private LocalDateTime now;
@@ -37,4 +39,13 @@
private List<Integer> paperIds;
+ private String createDepartment;
+
+ private Integer createUser;
+
+ /**
+ * 鏃堕棿鍛ㄦ湡
+ */
+ private List<LocalDateTime> period;
+
}
--
Gitblit v1.8.0