Merge branch 'master-fwq-爆款活动2.0' into master-test

fwq

2024-06-06 04c7ad9c89002913dd4d906d7701391d0a0c5398

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

@@ -32,4 +32,6 @@
    private List<String> employeeIdList;
    /**统计类型*/
    private String countType;
    /**是否统计顾问数据*/
    private Integer isCountAdviser = 0;
}