Merge branch 'master-fwq-颜值规划4.0' into master-prod-new

fwq

2024-04-15 7285f70c4804d88c175ace932956eec524e2ceda

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

@@ -19,6 +19,8 @@
    private String endTime;
    /**门店列表标识*/
    private List<String> shopIdList;
    /** 是否过滤测试用户账号 */
    private Integer isFilterTestAccount;

    /**业绩类型-门店日现金业绩*/
    public static final String  TYPE_DAY_CASH= "day_cash";