From 97bb8aca42a1d734380d4dde460f8ce389196a01 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 19 九月 2023 11:26:31 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq-phis下载中心

---
 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 e324612..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;
 
 /**
  * 鍒掓墸
@@ -34,7 +35,10 @@
     private String userShopId;
     /**閿�鍞钩鍙�*/
     private String sourceName;
-
+    /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+    private Integer isFilterTestAccount;
+    /**涓氱哗绫诲瀷*/
+    private List<Integer> sourceTypeList;
     /*******淇濆瓨鍙傛暟********/
     /**鎿嶄綔浜烘爣璇�*/
     private String operatorId;

--
Gitblit v1.8.0