Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-17 b69d2017fecdad6a1c9a09c0006e70ecea9efed0

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

@@ -248,6 +248,10 @@
    @ApiModelProperty("权限资格")
    private String permission;

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



}