From 4a4eb1f83e7eb205390886aa7eaa2d4f51ff251b Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期三, 13 九月 2023 16:10:36 +0800
Subject: [PATCH] Merge branch 'rx-0822-咨询记录' into master-test
---
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