123

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/UserUpdateReq.java

@@ -10,7 +10,7 @@ public class UserUpdateReq {
     @Schema(description = "用户ID",accessMode = Schema.AccessMode.READ_ONLY)
     private Long userId;
     @Schema(description = "城市")
-    private Long city;
+    private Integer cityId;
     @Schema(description = "昵称")
     private String nickname;
     @Schema(description = "生日")

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/AnchorListQuery.java

@@ -17,5 +17,5 @@ public class AnchorListQuery {
     private Integer type;
 
     @Schema(description = "城市（同城查询使用）")
-    private String city;
+    private Integer cityId;
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/GreetQuery.java

@@ -7,7 +7,7 @@ import lombok.Data;
 @Schema(description = "群打招呼用户搜索")
 public class GreetQuery {
     @Schema(description = "城市")
-    private Long city;
+    private Integer cityId;
     @Schema(description = "搜索类型 1=活跃 2=同城")
     private Integer type = 1;
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/AnchorListVo.java

@@ -1,34 +1,44 @@
 package com.ruoyi.cai.dto.app.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
 
 @Data
+@Schema(description = "主播列表信息")
 public class AnchorListVo {
     /**
      * 头像
      */
+    @Schema(description = "主播头像")
     private String avatar;
 
     /**
      * 性别   0 未知  1  女  2 男
      */
+    @Schema(description = "性别")
     private Integer gender;
     /**
      * 城市
      */
-    private Long city;
+    @Schema(description = "城市ID")
+    private Integer cityId;
+    @Schema(description = "城市")
+    private String city;
     /**
      * 昵称
      */
+    @Schema(description = "昵称")
     private String nickname;
     /**
      * 用户号/ID号
      */
+    @Schema(description = "蜜瓜号")
     private String usercode;
     /**
      * 用户评分
      */
+    @Schema(description = "评分")
     private BigDecimal giveScore;
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/CurrentUserInfoVo.java

@@ -54,8 +54,10 @@ public class CurrentUserInfoVo {
     /**
      * 城市
      */
+    @Schema(description = "城市ID")
+    private Integer cityId;
     @Schema(description = "城市")
-    private Long city;
+    private String city;
     /**
      * 是否是播主  0 否  1 是
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/DynamicVo.java

@@ -26,8 +26,11 @@ public class DynamicVo {
     /**
      * 城市ID
      */
-    @Schema(description = "城市")
+    @Schema(description = "城市ID")
     private Integer cityId;
+
+    @Schema(description = "城市")
+    private String city;
     /**
      * 是否有附件  0 没有  1  有
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserBaseVo.java

@@ -4,8 +4,6 @@ package com.ruoyi.cai.dto.app.vo.user;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-
 @Data
 public class UserBaseVo {
 
@@ -23,8 +21,10 @@ public class UserBaseVo {
     /**
      * 城市
      */
+    @Schema(description = "城市ID")
+    private Integer cityId;
     @Schema(description = "城市")
-    private Long city;
+    private Integer city;
     /**
      * 昵称
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserInfoVo.java

@@ -25,6 +25,10 @@ public class UserInfoVo {
     private String nickname;
     @Schema(description = "头像")
     private String avatar;
+    @Schema(description = "城市")
+    private String city;
+    @Schema(description = "城市ID")
+    private Integer cityId;
 
     /**
      * 价格，默认50彩币