From 1545c2c27ebef1230a2d7c1068d5d79579daeef5 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期三, 20 九月 2023 18:01:57 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java |    2 ++
 phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java      |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
index d5ee25f..cee6e84 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
+++ b/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;
     /*******淇濆瓨鍙傛暟********/
diff --git a/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java b/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
index 3d638b7..243414e 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/bi/revenue/RevenueQuery.java
+++ b/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;
 

--
Gitblit v1.8.0