From 9a9e8d995ea4c95e0303b456cf6fcd4188f97366 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 14 十一月 2023 15:41:00 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java |    4 ++++
 1 files changed, 4 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 b96afca..c470b2c 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
@@ -19,6 +19,10 @@
     private String uniqueStr;
     /**棰勭害闂ㄥ簵鏍囪瘑*/
     private String shopId;
+    /**鏄惁涓氱哗鍛樺伐(0:鍚�,1:鏄�)*/
+    private Integer isPerformanceEmp;
     /**鍛樺伐瑙掕壊鍞竴鏍囪瘑鏁扮粍*/
     private List<String> roleList;
+    /**绫诲瀷*/
+    private Integer type;
 }

--
Gitblit v1.8.0