From 2fd7ab1738baaa1bfd49e38cea13dc06ff7429ad Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 14 九月 2023 09:59:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java |    4 +++-
 1 files changed, 3 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..d5ee25f 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,8 @@
     private String sourceName;
     /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
     private Integer isFilterTestAccount;
-
+    /**涓氱哗绫诲瀷*/
+    private List<Integer> sourceTypeList;
     /*******淇濆瓨鍙傛暟********/
     /**鎿嶄綔浜烘爣璇�*/
     private String operatorId;

--
Gitblit v1.8.0