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/employee/EmployeeRoleDto.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeRoleDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeRoleDto.java
index 471445d..9db529b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeRoleDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeRoleDto.java
@@ -21,4 +21,6 @@
     private String  roleId;
     /**瑙掕壊琛ㄦ爣璇�*/
     private String  roleTypeId;
+    /**鏄惁鍚岄棬搴�*/
+    private Integer isSameShop;
 }

--
Gitblit v1.8.0