From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java b/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
index 1b6daf9..d313c60 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
@@ -35,9 +35,14 @@
 
     @ApiModelProperty(value = "鎵嬫満鍙风爜")
     private String mobile;
+    @ApiModelProperty(value = "浼佷笟鍚嶇О")
+    private String companyName;
 
     @ApiModelProperty(value = "瑙掕壊ID")
     private Integer roleId;
+
+    @ApiModelProperty(value = "浼佷笟缂栫爜")
+    private Integer companyId;
 
     @ApiModelProperty(value = "鐢ㄦ埛鐘舵��")
     private Integer status;
@@ -45,8 +50,14 @@
     @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛�0=鍙告満 锛� 2=鍐呴儴浜哄憳" ,hidden = true)
     private Integer memberType;
 
-    @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛�0=鍔冲姟锛�1=鍐呴儴" ,hidden = true)
+    @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛�0=鐩稿叧鏂癸紱1=鍐呴儴" ,hidden = true)
     private Integer companyType;
 
+    @ApiModelProperty(value = "鏄惁鏌ヨ鍥哄畾浜哄憳锛�0=鍚︼紱1=鏄�" )
+    private Integer querySpecial;
+
+    @ApiModelProperty(value = "鏄惁鏌ヨ鍥哄畾浜哄憳缁勭粐涓婚敭" ,hidden = true)
+    private String companySpecialId;
+
 
 }

--
Gitblit v1.9.3