From 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 29 十月 2024 13:32:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/domain/vo/ExamVO.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 86f7669..31bebbb 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/ExamVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/ExamVO.java
@@ -41,20 +41,24 @@
private String status;
/** 寮�濮嬫椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
/** 缁撴潫鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
/** 鍒涘缓鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/** 鍒涘缓鑰佸笀 */
private Integer teacherId;
+ /** 鏄惁鏄户缁�冭瘯 */
+ private Boolean isContinue;
+ /** 鎻愪氦鐘舵�� */
+ private String submitStatus;
public static ExamVO getVoByEntity(@NonNull Exam entity, ExamVO vo) {
if(vo == null) {
vo = new ExamVO();
--
Gitblit v1.8.0