Merge remote-tracking branch 'origin/master-prod-new' into master-test

fwq

2023-03-30 38783647b5cc7725174315ab6732f98bf37870f2

Merge remote-tracking branch 'origin/master-prod-new' into master-test

 phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java

@@ -15,6 +15,10 @@
    private String updateTime;
    /**员工企业userId*/
    private String userId;
    /**角色唯一字符串*/
    private String uniqueStr;
    /**预约门店标识*/
    private String shopId;
    /**员工角色唯一标识数组*/
    private List<String> roleList;
}

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

 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java

@@ -19,6 +19,8 @@
    private String tel;
    /**所属门店标识*/
    private String shopId;
    /**所属顾问标识*/
    private String hisCorpUserId;
    /**所属顾问名称*/
    private String beCorpUser;
    /**是否查询所属顾问信息:0否1是*/

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java

@@ -64,7 +64,7 @@
    @PostMapping(value = "/emp/role/liset")
    Result roleList(@RequestBody(required = false) EmployeeDto employeeDto);

    /**员工-角色列表*/
    /**获取员工-角色列表*/
    @PostMapping(value = "/emp/role/info/list")
    Result employeeRoleList(@RequestBody(required = false) EmployeeRoleDto employeeRoleDto);