Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-07 b5cd7ecda891e9de3453d819f63795c551a2436b

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

@@ -66,7 +66,7 @@
     * 修改人id
     */
    @ApiModelProperty("修改人id")
    private Integer updateUserId;
    private String updateUserId;

    /**
     * 小程序二维码