From 541e9a5eb10f788f1f8067823fa6f71e1b52c31e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 12 十二月 2022 14:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 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..15ae1f3 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
@@ -28,4 +28,11 @@
     private String userCouponId;
     //闈炲繀濉� 璁㈠崟棰嗗缓鏍囪瘑
     private String hisOrderId;
+
+    //闈炲繀濉� 浼樻儬鍒竔d闆嗗悎
+    private List<String> userCouponIds;
+    //闈炲繀濉� 鏀堕摱鍛榠d
+    private String cashier;
+    //闈炲繀濉� 鏀堕摱鍛橀棬搴�
+    private String cashierShopId;
 }

--
Gitblit v1.8.0