Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 15fa429882915d83cb91a2b4e971ebdb46e1cbb6

 flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java

@@ -244,6 +244,20 @@
    private Integer transactionNum;


    @TableField(exist = false)
    @ApiModelProperty("权限资格")
    private String permission;

    @TableField(exist = false)
    @ApiModelProperty("角色名称")
    private String roleName;


    @TableField(exist = false)
    @ApiModelProperty("创建人名称")
    private String createName;

    @ApiModelProperty("是否是部门领导（1是  2不是）")
    private String isDivisionHead;

}