From a2513c6a269fb14939a8e5d16b8be13f5931bd86 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 23 三月 2023 15:37:13 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index ef3061c..3610f04 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -13,19 +13,31 @@
*/
@Data
public class PayDto {
- //蹇呭～ 鏄惁鏄寜椤圭洰浠樻,0:鍚�,1:鏄�,榛樿:0
+ /**蹇呭～ 鏄惁鏄寜椤圭洰浠樻,0:鍚�,1:鏄�,榛樿:0*/
private Integer type;
- //蹇呭～ 璁㈠崟id
+ /**蹇呭～ 璁㈠崟id*/
private String orderId;
- //蹇呭～ 搴斾粯鎬婚噾棰�
+ /**蹇呭～ 搴斾粯鎬婚噾棰�*/
private String total;
- //蹇呭～ 缁撹处鍙傛暟
+ /**蹇呭～ 缁撹处鍙傛暟*/
private List<PayAmountDto> amount;
- //蹇呭～ 鎿嶄綔浜烘爣璇�,crm濉敤鎴�
+ /**蹇呭～ 鎿嶄綔浜烘爣璇�,crm濉敤鎴�*/
private String operatorId;
- //闈炲繀濉� 浼樻儬鍒竔d
+ /**鏀粯鐢ㄦ埛*/
+ private String payUserId;
+
+ /**闈炲繀濉� 浼樻儬鍒竔d*/
private String userCouponId;
- //闈炲繀濉� 璁㈠崟棰嗗缓鏍囪瘑
+
+ /**闈炲繀濉� 璁㈠崟棰嗗缓鏍囪瘑*/
private String hisOrderId;
+ /**闈炲繀濉� 鏀堕摱鍛榠d*/
+ private String cashier;
+
+ /**闈炲繀濉� 鏀堕摱鍛橀棬搴�*/
+ private String cashierShopId;
+
+ /**闈炲繀濉� 浼樻儬鍒竔d闆嗗悎*/
+ private List<String> userCouponIds;
}
--
Gitblit v1.8.0