Merge branch 'master-prod-new' into master-fwq抽奖配置

fwq

2023-10-30 ef212c321c6d833d69091e7491521f7d11984bfb

 phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java

@@ -22,6 +22,10 @@
    private List<String> employeeIdList;
    /**门店标识集合*/
    private List<String> shopIdList;
    /**用户状态*/
    List<String> userStatusList;
    /**是否查询VIP用户*/
    Integer selectVip;
    /**当前时间*/
    private String nowTime;
    /**开始时间*/