From 570e48eb85b3958f56ade7e58a1ab9ef5a4957ed Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 05 六月 2024 17:07:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
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