Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-14 7b7ae2fbc3c43cf08949b2fd8949ea6c17b3c129

 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;

    /**
     * 访问时间