From 0f0a66dbd463f239c128cacc82e87b046257d4e0 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 30 九月 2024 16:50:42 +0800
Subject: [PATCH] 1.修改到访和撤回逻辑 2.会员来访明细查询修改

---
 phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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 720798c..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,13 +4,15 @@
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 鍒掓墸
  **/
 @Data
 public class CashierSettlementDto extends BaseQueryVo{
-
+    /**鏄惁鍗曢〉杩斿洖*/
+    private Integer selectReturn = 0;
     /**寮�鍗曞紑濮嬫椂闂�*/
     private Date startTime;
     /**寮�鍗曠粨鏉熸椂闂�*/
@@ -31,7 +33,14 @@
     private String shopId;
     /**瀹㈡埛鎵�灞為棬搴�*/
     private String userShopId;
-
+    /**閿�鍞钩鍙�*/
+    private String sourceName;
+    /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+    private Integer isFilterTestAccount;
+    /**鏄惁杩囨护瀵瑰啿鏁版嵁*/
+    private Integer isHedging;
+    /**涓氱哗绫诲瀷*/
+    private List<Integer> sourceTypeList;
     /*******淇濆瓨鍙傛暟********/
     /**鎿嶄綔浜烘爣璇�*/
     private String operatorId;

--
Gitblit v1.8.0