Merge branch 'master-fwq-积分抵扣现金' into master-prod-new

fwq

2024-05-01 623afb6fbb8ce6adebf237e7b670d9f4f339184d

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

@@ -34,6 +34,10 @@
    private String loginCnName;
    /**登录员工唯一字符串*/
    private String loginEmpStr;
    /** 是否过滤测试用户账号 */
    private Integer isFilterTestAccount;
    /**是否查询复购数据,0否1是*/
    private Integer isSelectRepurchase = 0;

    public List<String> getShopIdList() {
        if(shopIdList == null){