From e49d6551b73457f5dde2ea1d5e267028525ba05b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 17 六月 2024 09:19:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/domain/vo/ExamVO.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/ExamVO.java b/src/main/java/com/ycl/jxkg/domain/vo/ExamVO.java
index 5054d4c..86f7669 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/ExamVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/ExamVO.java
@@ -1,5 +1,6 @@
package com.ycl.jxkg.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.jxkg.domain.base.AbsVo;
import com.ycl.jxkg.domain.entity.Exam;
import java.util.List;
@@ -24,12 +25,14 @@
/** 璇曞嵎ID */
private Integer examPaperId;
+ private String examPaperName;
/** 鐝骇ID */
private Integer classesId;
+ private String className;
/** 璇曞嵎绫诲瀷 */
- private String examPaperType;
+ private Integer examPaperType;
/** 鑰冭瘯鍦扮偣 */
private String examPlace;
@@ -38,12 +41,15 @@
private String status;
/** 寮�濮嬫椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/** 缁撴潫鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/** 鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 鍒涘缓鑰佸笀 */
--
Gitblit v1.8.0