Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 726c2e196bac6e56f588736c68b07a933dabb127

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

@@ -41,6 +41,8 @@
     * 用户id
     */
    @ApiModelProperty("用户id")
    @JsonSerialize(using = ToStringSerializer.class)
    @JsonFormat(shape =JsonFormat.Shape.STRING )
    private Long userId;


@@ -230,7 +232,33 @@
    @ApiModelProperty("办结事项名称")
    private String transactionNames;

    /**
     * 微信小程序id
     */
    @ApiModelProperty("微信小程序id")
    private String openid;

    /**
     * 待处理办事指南数量
     */
    @ApiModelProperty("待处理办事指南数量")
    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;

}