Merge branch 'huacheng_test' into haucheng_panzhihua

张天森

2022-11-16 7a8e31ceb01c7eb27d90197ec91efdfce4bedb41

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

@@ -34,7 +34,7 @@
    @ApiModelProperty(name = "userId", value = "主键用户id")
    @JsonSerialize(using = ToStringSerializer.class)
    @TableId(value = "user_id", type = IdType.AUTO)
    private Long userId;
    private String userId;

    /**
     * 登录账户