From ee12f2e9d0a8bbeab9627cbc79f04030365f06b7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 09 五月 2023 19:02:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-prod-new-优惠券校验
---
phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 faa5e20..12f1a2c 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;
/**寮�鍗曠粨鏉熸椂闂�*/
@@ -25,12 +26,12 @@
private String userInviteeName;
/**鎵�灞炲挩璇㈠笀*/
private String userCorpUserName;
- /**鎵�灞為棬搴�*/
- private String userShopName;
/**鍟嗗搧鍚嶇О*/
private String goodsName;
- /**鎵�灞為棬搴�*/
+ /**璁㈠崟鎵�灞為棬搴�*/
private String shopId;
+ /**瀹㈡埛鎵�灞為棬搴�*/
+ private String userShopId;
/*******淇濆瓨鍙傛暟********/
/**鎿嶄綔浜烘爣璇�*/
--
Gitblit v1.8.0