Merge branch 'master-fwq-团购提前扣取金额' into master-test

fwq

2024-06-14 5d542ef50426fdaf5c06d09f6a7c5d13529ea4ac

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

@@ -24,4 +24,14 @@
    private String sleepTime;
    /**门店列表标识*/
    private List<String> shopIdList;
    /** 是否过滤测试用户账号 */
    private Integer isFilterTestAccount;
    /**是否统计现金业绩*/
    private Integer isCountCash = 0;
    /**员工标识列表*/
    private List<String> employeeIdList;
    /**统计类型*/
    private String countType;
    /**是否统计顾问数据*/
    private Integer isCountAdviser = 0;
}