From 7918b04206c4879f098789c619a4d5637906856d Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 03 十月 2023 22:29:59 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
index 7bc4cb5..bf2610d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
@@ -15,6 +15,12 @@
     private String updateTime;
     /**鍛樺伐浼佷笟userId*/
     private String userId;
+    /**瑙掕壊鍞竴瀛楃涓�*/
+    private String uniqueStr;
+    /**棰勭害闂ㄥ簵鏍囪瘑*/
+    private String shopId;
+    /**鏄惁涓氱哗鍛樺伐(0:鍚�,1:鏄�)*/
+    private Integer isPerformanceEmp;
     /**鍛樺伐瑙掕壊鍞竴鏍囪瘑鏁扮粍*/
     private List<String> roleList;
 }

--
Gitblit v1.8.0