From 5073a245f53fd5ca936e779be8c6b9b19d42f67d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 11 七月 2024 09:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/domain/entity/User.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/User.java b/src/main/java/com/ycl/jxkg/domain/entity/User.java
index bf68076..3b827d2 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/User.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/User.java
@@ -1,8 +1,10 @@
package com.ycl.jxkg.domain.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
+import com.ycl.jxkg.enums.general.YesOrNoEnum;
import lombok.Data;
import java.io.Serializable;
@@ -69,10 +71,10 @@
@TableField("image_path")
private String imagePath;
- @TableField("create_time")
+ @TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
- @TableField("modify_time")
+ @TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
private Date modifyTime;
@TableField("last_active_time")
@@ -84,4 +86,16 @@
@TableField("wx_open_id")
private String wxOpenId;
+ @TableField("need_update_password")
+ /**
+ * 鏄惁闇�瑕佷慨鏀瑰瘑鐮�
+ */
+ private YesOrNoEnum needUpdatePassword;
+
+ @TableField("last_update_password_time")
+ /**
+ * 涓婁竴娆′慨鏀瑰瘑鐮佺殑鏃堕棿
+ */
+ private Date lastUpdatePasswordTime;
+
}
--
Gitblit v1.8.0