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

fwq

2023-11-14 091a21654aa3a3effdcf0a3a3fbf982e6e4a9e99

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

@@ -23,4 +23,6 @@
    private Integer isPerformanceEmp;
    /**员工角色唯一标识数组*/
    private List<String> roleList;
    /**类型*/
    private Integer type;
}