From 93fc01349aa48a086c71123a2317765a925c0897 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 06 一月 2025 10:22:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
index 196e1e6..a768ad8 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
@@ -3,13 +3,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.doumee.core.constants.OperaType;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
@@ -84,13 +83,22 @@
@ApiModelProperty(value = "鍒涘缓浜�", example = "1", hidden = true)
private Integer createUser;
+ @ApiModelProperty(value = "鏄惁闇�瑕佸己鍒舵洿鏂板瘑鐮� 0鏄� 1鍚�")
+ private Integer needChangePwd;
@ApiModelProperty(value = "鏇存柊浜�", example = "1", hidden = true)
private Integer updateUser;
@ApiModelProperty(value = "寰俊openid", example = "1", hidden = true)
private String openid;
+ @ApiModelProperty(value = "寰俊openid鎺ㄩ�佹捣搴风姸鎬� 0寰呮帹閫� 1宸叉帹閫� 2缁戝畾澶辫触", example = "1", hidden = true)
+ private Integer openidHkStatus;
+ @ApiModelProperty(value = "寰俊openid鎺ㄩ�佹捣搴峰娉� ", example = "1", hidden = true)
+ private String openidHkInfo;
+ @ApiModelProperty(value = "寰俊openid鎺ㄩ�佹捣搴锋椂闂�", example = "1", hidden = true)
+ private Date openidHkDate;
+ //2024骞�12鏈�6鏃�11:00:30 绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳
@ApiModelProperty(value = "绫诲瀷 0骞冲彴鐢ㄦ埛 1璁垮", example = "0")
private Integer type;
--
Gitblit v1.9.3