From 94b0a6092c7bcc11bec5f8a3cbee3c46acf12a23 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 十月 2024 19:14:37 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserListQueryDto.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 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 876d173..960bcaf 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,29 @@
 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 {
+    @ApiModelProperty(value = "用户手机号")
     String userPhone;
+    @ApiModelProperty(value = "所在省code")
+    String provinceCode;
+    @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;
+
+    @ApiModelProperty(value = "到期天数1")
+    Integer vipEndTime1;
+    @ApiModelProperty(value = "到期天数2")
+    Integer vipEndTime2;
+
 }

--
Gitblit v1.7.1