Merge branch 'master-prod-new' into fhx-prod-秒杀日历

fhx

2024-07-25 0fe1b32aace6a0810c8f0ff5bbcbeb710fd52f37

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

@@ -18,8 +18,12 @@
    private List<String> employeeIdList;
    /**门店标识集合*/
    private List<String> shopIdList;
    /**群标识集合*/
    private List<String> groupIdList;
    /**用户状态*/
    private List<String> userStatusList;
    /**品项名称*/
    private List<String> projectNameList;
    /**执行数*/
    private Integer deductionNum;
    /**开始时间*/