Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

2 天以前 3033ccf3878fae2c204df53be2a283f29f5853ed

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -135,7 +135,9 @@
    @ApiModelProperty(value = "角色类型 1=平台 2=分公司 3=业务员 4=供应商 5=诊所端 6=仓库员")
    @TableField(value = "role_type")
    private Integer roleType;

    @ApiModelProperty(value = "微信openid")
    @TableField("open_id")
    private String openId;
    public String getRoleName() {
        return roleName;
    }