From 807247d2fd99fd5d51f3589695785c21762eb197 Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期二, 03 一月 2023 17:38:30 +0800
Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign into master-prod-new

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

--
Gitblit v1.8.0