From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java b/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java
index 907be16..b635d74 100644
--- a/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java
+++ b/server/system_service/src/main/java/com/doumee/core/model/LoginUserInfo.java
@@ -1,5 +1,6 @@
 package com.doumee.core.model;
 
+import com.doumee.core.utils.Constants;
 import com.doumee.dao.business.model.Company;
 import com.doumee.dao.system.model.SystemPermission;
 import com.doumee.dao.system.model.SystemRole;
@@ -36,8 +37,10 @@
 
     private Integer memberId;
     private Integer type;
+    private Integer needChangePwd;
     private String mobile;
     private String sessionId;
+    private String hkMenuToken;
 
     private Date loginDate;
     @ApiModelProperty(value = "璐︽埛鏉ユ簮锛�0=鍚庡彴娣诲姞 锛� 2=鍙告満娉ㄥ唽")
@@ -65,6 +68,7 @@
                 rs.add(role.getCode());
             }
         }
+        loginUserInfo.setNeedChangePwd(Constants.formatIntegerNum(user.getNeedChangePwd()));
         loginUserInfo.setSessionId(sessionId);
         loginUserInfo.setRoles(rs);
         // 璁剧疆鏉冮檺淇℃伅

--
Gitblit v1.9.3