Merge branch 'master-stander' into master-jiayan

fwq

10 小时以前 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061

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

@@ -37,6 +37,8 @@
    private String sourceName;
    /**是否过滤测试账号*/
    private Integer isFilterTestAccount;
    /**是否过滤对冲数据*/
    private Integer isHedging;
    /**业绩类型*/
    private List<Integer> sourceTypeList;
    /*******保存参数********/