Merge branch 'fhx-prod-热门活动' into master-prod-new

fhx

2023-08-07 1f958e1435689b008e04f9d3c6d5133d0c3a9b8c

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