From 37993b3cf3243e6ffdacab526b04dd2284565a42 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 25 七月 2024 18:59:31 +0800
Subject: [PATCH] Merge branch 'master-base' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java
index 6d50a4d..224d021 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java
@@ -19,12 +19,24 @@
     private List<String> adviserIdList;
     /**椤鹃棶缂栧彿*/
     private List<String> adviserNoList;
+    /**鐧诲綍鍛樺伐鏍囪瘑*/
+    private String loginEmpId;
+    /**鐧诲綍鍛樺伐鍚嶇О*/
+    private String loginCnName;
+    /**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
+    private String loginEmpStr;
+    /**鎿嶄綔浜�*/
+    private String operatorId;
+    /**鎿嶄綔浜哄悕绉�*/
+    private String operatorName;
 
     /**鏌ヨ娲昏穬鑰乂IP,娴佸け(娴佸け)/娲昏穬(鐘舵��)/娌夌潯(鐘舵��)涔嬮棿鏄�愭垨銆戝叧绯�0:娴佸け 1:娲昏穬 2:娌夌潯*/
     private List<Integer> oldVipList;
 
     /**鏌ヨ瀹㈡埛绛夌骇,绛夌骇涔嬮棿鏄�愭垨銆戝叧绯�*/
     private List<String> userLevelList;
+    /**鏌ヨ瀹㈡埛鐘舵��,鐘舵�佷箣闂存槸銆愭垨銆戝叧绯�*/
+    private List<String> statusList;
 
     /**涓夊ぇ椤圭洰鏈墽琛屽ぇ鐨勬槸銆愪笖銆�,鍚勮嚜鏄�愭垨銆�*/
     /**鎵撳崱椤圭洰0:1-3涓湀鏈墽琛�,1:4-6涓湀鏈墽琛�,2:>6涓湀鏈墽琛�*/

--
Gitblit v1.8.0