Merge branch 'rx-1023-营销优惠券新版' into master-test

rx

2023-10-30 bb330a3a9201315bb1b566c8ea49ac2b2c91596c

 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;