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

lidongdong

2022-10-24 2d26c2b864cad8b988adc5258e3e06eaff4c35a4

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

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


    /**