From fd35f223b7f40ee9ee4a9307384b54a96d7956a2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 十月 2024 09:35:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserListQueryDto.java | 8 ++++++++
1 files changed, 8 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 b958d1d..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
@@ -8,6 +8,8 @@
public class UserListQueryDto extends BasePage {
@ApiModelProperty(value = "用户手机号")
String userPhone;
+ @ApiModelProperty(value = "所在省code")
+ String provinceCode;
@ApiModelProperty(value = "所在地code")
String cityCode;
@ApiModelProperty(value = "状态 1正常2冻结 3注销")
@@ -18,4 +20,10 @@
Integer vipTypeId;
@ApiModelProperty(value = "单位id")
Integer companyId;
+
+ @ApiModelProperty(value = "到期天数1")
+ Integer vipEndTime1;
+ @ApiModelProperty(value = "到期天数2")
+ Integer vipEndTime2;
+
}
--
Gitblit v1.7.1