ANDRU-PC\Andru
2023-09-20 1545c2c27ebef1230a2d7c1068d5d79579daeef5
Merge branch 'master-prod-new' into master-test
2个文件已修改
4 ■■■■ 已修改文件
phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
    /*******保存参数********/
phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
@@ -40,6 +40,8 @@
    private Date endCreateTime;
    /**是否过滤测试账号*/
    private Integer isFilterTestAccount;
    /**是否过滤对冲数据*/
    private Integer isHedging;
    /**业绩类型*/
    private List<Integer> sourceTypeList;