Merge branch 'master-prod-new' into master-test

fwq

2024-05-24 b28a5cde3ddcb7ab1eda3b612014bdf2e717af5b

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