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

yanghui

2022-10-24 f40fe15033bc21b05ce626160e623af06bdf8b83

 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;


    /**