From a2513c6a269fb14939a8e5d16b8be13f5931bd86 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 23 三月 2023 15:37:13 +0800
Subject: [PATCH] Merge branch 'master-prod-new' 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 f0aa39c..7bc4cb5 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
@@ -3,6 +3,8 @@
 import com.hz.his.dto.PageDto;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author fwq
  * 鍛樺伐鎵╁睍
@@ -11,4 +13,8 @@
 public class EmployeeDto extends PageDto {
     /**淇敼鏃堕棿*/
     private String updateTime;
+    /**鍛樺伐浼佷笟userId*/
+    private String userId;
+    /**鍛樺伐瑙掕壊鍞竴鏍囪瘑鏁扮粍*/
+    private List<String> roleList;
 }

--
Gitblit v1.8.0