From 64f45c75ea93911b9841bf00bb4c436cd294be3a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 18:30:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java b/server/service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
index 1824ab9..53b5b32 100644
--- a/server/service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
@@ -30,6 +30,10 @@
@ApiModelProperty(value = "鐢ㄦ埛鍚�")
private String username;
+
+ @ApiModelProperty(value = "鐢ㄦ埛鍚嶃�佹墜鏈哄彿妯＄硦鏌ヨ")
+ private String keyword;
+
@ApiModelProperty(value = "濮撳悕" , hidden = true)
private String realname;
@@ -45,12 +49,15 @@
@ApiModelProperty(value = "鐪佺紪鐮�")
private Integer provinceId;
+ @ApiModelProperty(value = "鐘舵�侊細0 鍚敤 1 绂佺敤")
+ private Integer status;
+
@ApiModelProperty(value = "鍩庡競缂栫爜", example = "1" )
private Integer cityId;
@ApiModelProperty(value = "鍩庡競缂栫爜", hidden = true)
private List<Integer> cityIds;
- @ApiModelProperty(value = "绫诲瀷 0骞冲彴鐢ㄦ埛 1浼佷笟鐢ㄦ埛")
+ @ApiModelProperty(value = "绫诲瀷 0骞冲彴鐢ㄦ埛 1浼佷笟鐢ㄦ埛 2涓绘挱")
private Integer type;
--
Gitblit v1.9.3