Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
| | |
| | | @ApiModelProperty(value = "角色类型 1=平台 2=分公司 3=业务员 4=供应商 5=诊所端 6=仓库员") |
| | | @TableField(value = "role_type") |
| | | private Integer roleType; |
| | | |
| | | public String getRoleName() { |
| | | return roleName; |
| | | } |
| | |
| | | |
| | | <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 |