From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期三, 12 三月 2025 09:35:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X --- ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java index a770089..338d4d7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java @@ -1,8 +1,9 @@ package org.dromara.common.core.domain.model; -import org.dromara.common.core.domain.dto.RoleDTO; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.core.domain.dto.PostDTO; +import org.dromara.common.core.domain.dto.RoleDTO; import java.io.Serial; import java.io.Serializable; @@ -14,7 +15,6 @@ * * @author Lion Li */ - @Data @NoArgsConstructor public class LoginUser implements Serializable { @@ -36,6 +36,11 @@ * 閮ㄩ棬ID */ private Long deptId; + + /** + * 閮ㄩ棬绫诲埆缂栫爜 + */ + private String deptCategory; /** * 閮ㄩ棬鍚� @@ -98,16 +103,36 @@ private String username; /** + * 鐢ㄦ埛鏄电О + */ + private String nickname; + + /** * 瑙掕壊瀵硅薄 */ private List<RoleDTO> roles; /** + * 宀椾綅瀵硅薄 + */ + private List<PostDTO> posts; + + /** * 鏁版嵁鏉冮檺 褰撳墠瑙掕壊ID */ private Long roleId; /** + * 瀹㈡埛绔� + */ + private String clientKey; + + /** + * 璁惧绫诲瀷 + */ + private String deviceType; + + /** * 鑾峰彇鐧诲綍id */ public String getLoginId() { -- Gitblit v1.9.3