From 68426f6bb5976e4852dfdb82f55fcb0e4fd9703a Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期四, 21 九月 2023 18:58:48 +0800
Subject: [PATCH] Merge branch 'rx-0918-完善资料' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 cf27166..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
@@ -4,6 +4,7 @@
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 鍒掓墸
@@ -36,7 +37,10 @@
     private String sourceName;
     /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
     private Integer isFilterTestAccount;
-
+    /**鏄惁杩囨护瀵瑰啿鏁版嵁*/
+    private Integer isHedging;
+    /**涓氱哗绫诲瀷*/
+    private List<Integer> sourceTypeList;
     /*******淇濆瓨鍙傛暟********/
     /**鎿嶄綔浜烘爣璇�*/
     private String operatorId;

--
Gitblit v1.8.0