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

yanghui

2022-10-24 baf2d29c0c8ec7329966a1af44ac9dd8f4b05e9c

 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;

    /**
     * 小程序二维码