liujie
2025-09-01 e1539fb07c1f43fcacd370cd2a42b0a543dffdcf
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
2个文件已修改
3 ■■■■ 已修改文件
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -135,6 +135,7 @@
    @ApiModelProperty(value = "角色类型 1=平台 2=分公司 3=业务员 4=供应商 5=诊所端 6=仓库员")
    @TableField(value = "role_type")
    private Integer roleType;
    public String getRoleName() {
        return roleName;
    }
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -51,7 +51,7 @@
    
    <sql id="selectUserVo">
        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status,
               u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.role_type as roleType,
               u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.role_type,
        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
        from sys_user u