From 2adc60ff9912923be2b59242dda1a77851dd8b5c Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 28 八月 2023 11:06:33 +0800
Subject: [PATCH] Merge branch 'rx-0814-开单项目' 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