From 05d651ca0168025ec451702f1df88dab4f2a9559 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 10 五月 2024 17:58:19 +0800
Subject: [PATCH] feat：新增补考按钮
---
src/main/java/com/mindskip/xzs/domain/vo/UserVO.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/domain/vo/UserVO.java b/src/main/java/com/mindskip/xzs/domain/vo/UserVO.java
index 5d1d64e..2bd26f4 100644
--- a/src/main/java/com/mindskip/xzs/domain/vo/UserVO.java
+++ b/src/main/java/com/mindskip/xzs/domain/vo/UserVO.java
@@ -1,5 +1,7 @@
package com.mindskip.xzs.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mindskip.xzs.domain.enums.UserConditionEnum;
import com.mindskip.xzs.utility.excel.ExcelImport;
import java.io.Serializable;
@@ -36,6 +38,7 @@
*/
private Integer sex;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date birthDay;
/**
@@ -63,10 +66,13 @@
*/
private String imagePath;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date modifyTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date lastActiveTime;
/**
@@ -79,6 +85,26 @@
*/
private String wxOpenId;
+ private UserConditionEnum condition;
+
+ private String conditionDetail;
+
+ public String getConditionDetail() {
+ return conditionDetail;
+ }
+
+ public void setConditionDetail(String conditionDetail) {
+ this.conditionDetail = conditionDetail;
+ }
+
+ public UserConditionEnum getCondition() {
+ return condition;
+ }
+
+ public void setCondition(UserConditionEnum condition) {
+ this.condition = condition;
+ }
+
public Integer getId() {
return id;
}
--
Gitblit v1.8.0