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 |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 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
new file mode 100644
index 0000000..12f1a2c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
@@ -0,0 +1,41 @@
+package com.hz.his.dto.report;
+
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鍒掓墸
+ **/
+@Data
+public class CashierSettlementDto extends BaseQueryVo{
+    /**鏄惁鍗曢〉杩斿洖*/
+    private Integer selectReturn = 0;
+    /**寮�鍗曞紑濮嬫椂闂�*/
+    private Date startTime;
+    /**寮�鍗曠粨鏉熸椂闂�*/
+    private Date endTime;
+    /**鐢ㄦ埛绛夌骇*/
+    private String userMemberName;
+    /**璁㈠崟鍙�*/
+    private String orderNo;
+    /**鏄惁鏄垵璇婂崟*/
+    private Integer isBothTheOne;
+    /**鎺ㄨ崘鍚嶇О*/
+    private String userInviteeName;
+    /**鎵�灞炲挩璇㈠笀*/
+    private String userCorpUserName;
+    /**鍟嗗搧鍚嶇О*/
+    private String goodsName;
+    /**璁㈠崟鎵�灞為棬搴�*/
+    private String shopId;
+    /**瀹㈡埛鎵�灞為棬搴�*/
+    private String userShopId;
+
+    /*******淇濆瓨鍙傛暟********/
+    /**鎿嶄綔浜烘爣璇�*/
+    private String operatorId;
+    /**鎿嶄綔浜�*/
+    private String operatorName;
+}

--
Gitblit v1.8.0