From 195af7b92b0aa5534cb28d25aa589f2d2545c7e9 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 25 九月 2023 17:17:38 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java | 8 +++++++-
1 files changed, 7 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..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;
/**
* 鍒掓墸
@@ -34,7 +35,12 @@
private String userShopId;
/**閿�鍞钩鍙�*/
private String sourceName;
-
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
+ /**鏄惁杩囨护瀵瑰啿鏁版嵁*/
+ private Integer isHedging;
+ /**涓氱哗绫诲瀷*/
+ private List<Integer> sourceTypeList;
/*******淇濆瓨鍙傛暟********/
/**鎿嶄綔浜烘爣璇�*/
private String operatorId;
--
Gitblit v1.8.0