Merge remote-tracking branch 'origin/master'

无关风月

9 小时以前 02bb94e413f6950b9786c5ee86c0937bc20f8ae8

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

@@ -152,6 +152,11 @@
    @ApiModelProperty(value = "营业部id")
    @TableField("business_dept_id")
    private String businessDeptId;
    @ApiModelProperty(value = "openId")
    @TableField("openId")
    private String openId;



    public String getRoleName() {
        return roleName;