From a1acacfb8cfa4b0e2fc07fbf214f4f9b47636c98 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 15 三月 2024 18:44:10 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java |    2 ++
 1 files changed, 2 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;
     /*******淇濆瓨鍙傛暟********/

--
Gitblit v1.8.0