From 6926c5a086d1da028a041753bfe4dcaf623c41e3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 10 八月 2024 13:46:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserListQueryDto.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserListQueryDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserListQueryDto.java
index 2605486..b958d1d 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserListQueryDto.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserListQueryDto.java
@@ -1,14 +1,21 @@
 package com.ruoyi.account.api.dto;
 
 import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class UserListQueryDto extends BasePage {
-    private  String userPhone;
-    private  String cityCode;
-    private  Integer status;
-    private Integer userTagId;
-    private  Integer vipTypeId;
-    private   Integer companyId;
+    @ApiModelProperty(value = "用户手机号")
+    String userPhone;
+    @ApiModelProperty(value = "所在地code")
+    String cityCode;
+    @ApiModelProperty(value = "状态 1正常2冻结 3注销")
+    Integer status;
+    @ApiModelProperty(value = "用户标签id")
+    Integer userTagId;
+    @ApiModelProperty(value = "会员类型id")
+    Integer vipTypeId;
+    @ApiModelProperty(value = "单位id")
+    Integer companyId;
 }

--
Gitblit v1.7.1