Merge branch 'huacheng_test' into haucheng_panzhihua

张天森

2022-10-24 07c7f39a97f4ea8f84d32e2e2075dfc9d6a1dd04

 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;


    /**