Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-27 c7a1a16c8d22b64f9025e800ebaf89b19b530228

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

@@ -42,7 +42,7 @@
     */
    @ApiModelProperty("用户id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;
    private String userId;


    /**
@@ -244,6 +244,34 @@
    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;

    @ApiModelProperty("办理事项ids")
    private String mattersIds;


    @TableField(exist = false)
    @ApiModelProperty("办理事项名称")
    private String mattersNames;



    @TableField(exist = false)
    @ApiModelProperty("办结事项数目")
    private String transactionEndNum;

}