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/ExamSubmitTempVO.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/ExamSubmitTempVO.java b/src/main/java/com/ycl/jxkg/domain/vo/ExamSubmitTempVO.java
index c844d63..b0b297e 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/ExamSubmitTempVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/ExamSubmitTempVO.java
@@ -1,15 +1,12 @@
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.ExamSubmitTemp;
-import java.util.List;
-
-import com.ycl.jxkg.enums.general.ExamSubmitTempStatusEnum;
-import org.springframework.lang.NonNull;
-import org.springframework.beans.BeanUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
+import org.springframework.lang.NonNull;
+
import java.util.Date;
/**
@@ -21,11 +18,13 @@
@Data
public class ExamSubmitTempVO extends AbsVo {
- /** */
private Integer examId;
- /** */
+ private String examName;
+
private Integer userId;
+
+ private String userName;
/** 鍋氶鑰楁椂 绉� */
private Integer doTime;
@@ -33,7 +32,7 @@
/** 鎻愪氦鐨勮瘯鍗峰唴瀹� */
private String examSubmit;
- /** */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 鐘舵�侊細涓存椂銆佷繚瀛� */
--
Gitblit v1.8.0