From e7dc439ed3c755282bcd766aed05dc3b6c10f6e5 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期六, 18 二月 2023 18:15:08 +0800 Subject: [PATCH] fix 修复 Redis 监控接口被误删 --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java index fb7fc0e..0de88f9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java @@ -1,6 +1,7 @@ package com.ruoyi.system.domain.vo; -import com.ruoyi.common.core.constant.UserConstants; +import com.ruoyi.common.translation.annotation.Translation; +import com.ruoyi.common.translation.constant.TransConstant; import lombok.Data; import java.io.Serial; @@ -12,8 +13,7 @@ /** * 鐢ㄦ埛淇℃伅瑙嗗浘瀵硅薄 sys_user * - * @author ruoyi - * @date 2023-02-01 + * @author Michelle.Chung */ @Data public class SysUserVo implements Serializable { @@ -25,6 +25,11 @@ * 鐢ㄦ埛ID */ private Long userId; + + /** + * 绉熸埛ID + */ + private String tenantId; /** * 閮ㄩ棬ID @@ -64,7 +69,8 @@ /** * 澶村儚鍦板潃 */ - private String avatar; + @Translation(type = TransConstant.OSS_ID_TO_URL) + private Long avatar; /** * 瀵嗙爜 @@ -120,9 +126,5 @@ * 鏁版嵁鏉冮檺 褰撳墠瑙掕壊ID */ private Long roleId; - - public boolean isAdmin() { - return UserConstants.SUPER_ADMIN_ID.equals(this.userId); - } } -- Gitblit v1.9.3