Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-15 8bfb698ca80914aa7b8e8e22cdeb7fdc7975bc7c

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

@@ -237,6 +237,12 @@
    @ApiModelProperty("微信小程序id")
    private String openid;

    /**
     * 待处理办事指南数量
     */
    @ApiModelProperty("待处理办事指南数量")
    private Integer transactionNum;