Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-01 6cebcdd663ac06a6a8aa931058a515aa38a14bc3

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

@@ -37,7 +37,7 @@
     * 用户id
     */
    @ApiModelProperty("用户id")
    private Long userId;
    private String userId;

    /**
     * 访问时间