From 034add97ea4cb999da850f1c597a76d0b49b920a Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 15 八月 2023 19:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java | 5 ++++-
1 files changed, 4 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 720798c..e324612 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
@@ -10,7 +10,8 @@
**/
@Data
public class CashierSettlementDto extends BaseQueryVo{
-
+ /**鏄惁鍗曢〉杩斿洖*/
+ private Integer selectReturn = 0;
/**寮�鍗曞紑濮嬫椂闂�*/
private Date startTime;
/**寮�鍗曠粨鏉熸椂闂�*/
@@ -31,6 +32,8 @@
private String shopId;
/**瀹㈡埛鎵�灞為棬搴�*/
private String userShopId;
+ /**閿�鍞钩鍙�*/
+ private String sourceName;
/*******淇濆瓨鍙傛暟********/
/**鎿嶄綔浜烘爣璇�*/
--
Gitblit v1.8.0