From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 f4bc48a..a2fab05 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,9 @@
@ApiModelProperty(value = "鐢ㄦ埛鍚�")
private String username;
+ @ApiModelProperty(value = "浼佷笟鍚嶇О")
+ private String companyName;
+
@ApiModelProperty(value = "鐢ㄦ埛鍚嶃�佹墜鏈哄彿妯＄硦鏌ヨ")
private String keyword;
@@ -61,11 +64,20 @@
@ApiModelProperty(value = "鍩庡競缂栫爜", hidden = true)
private List<Integer> cityIds;
- @ApiModelProperty(value = "绫诲瀷 0骞冲彴鐢ㄦ埛 1浼佷笟鐢ㄦ埛 2涓绘挱")
+ @ApiModelProperty(value = "绫诲瀷 0骞冲彴鐢ㄦ埛 1浼佷笟鐢ㄦ埛 2鍟嗘埛")
private Integer type;
-
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷闆嗗悎",hidden = true )
private List<Integer> typeList;
+ @ApiModelProperty(value = "閮ㄩ棬涓婚敭 - 鏂�")
+ private Integer companyDepartmentId;
+
+ @ApiModelProperty(value = "閮ㄩ棬鍚嶇О - 鏂�")
+ private String companyDepartmentPathName;
+
+
+
+
+
}
--
Gitblit v1.9.3