Merge remote-tracking branch 'origin/master-base' into master-test

chenjiahe

2024-08-01 e74dade001072c3a0e93cd6d698df4df2262f5a3

 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;
}