Merge branch 'master-prod-new' into master-test

Andru

2023-11-16 046dc12bf491f186ec96450aa5331c25f6e0fe54

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

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


    /**查询类型*/
    private Integer type;
    /**开始时间*/
    private String startTime;
    /**结束时间*/
    private String endTime;
}