From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/entity/User.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index fc623f8..94138e8 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -157,7 +157,7 @@
private String hold;
-
+ private Integer status;
/**
* 行政区域id
*/
@@ -207,4 +207,14 @@
@TableField("is_apply")
private Integer isApply;
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date birthtime;
+
+ /**
+ * 是否报名培训 1：是 2：否
+ */
+ @TableField("is_train")
+ private Integer isTrain;
+
}
--
Gitblit v1.9.3