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

rx

2023-11-15 46b9113cd98dd5a9247e8ec255c9ad1ce98cd650

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

@@ -19,6 +19,16 @@
    private String uniqueStr;
    /**预约门店标识*/
    private String shopId;
    /**是否业绩员工(0:否,1:是)*/
    private Integer isPerformanceEmp;
    /**员工角色唯一标识数组*/
    private List<String> roleList;


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