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

张天森

2022-10-24 1da83e3243ca7f892156711727d86d2a5aac1358

 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;


    /**