Merge remote-tracking branch 'origin/rx-1023-营销优惠券新版' into master-test

rx

2023-10-26 e0a35f3912912fb3a160ee2633594a2e6c828abc

 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;
}