Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-10-21 926df9e9365ddf60a5704fa198c07c1b73feb0e9

 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;


    /**