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

lidongdong

2022-10-25 f571b479a73944e721ef091cff6a437be819af2f

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

@@ -42,7 +42,7 @@
     */
    @ApiModelProperty("用户id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;
    private String userId;


    /**