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

fwq

2024-03-26 b240f579f8850915cbcfeda9806db61269d13a79

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

@@ -23,4 +23,14 @@
    private Integer isPerformanceEmp;
    /**员工角色唯一标识数组*/
    private List<String> roleList;
    /**员工编号*/
    private String employeeNo;


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