From 1dc614742b2b8d16d8aac09045cf5b15d2057650 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 13 六月 2023 09:58:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java |   10 ++++++++++
 1 files changed, 10 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 7d5e7c7..1744607 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,6 +13,7 @@
  */
 @Data
 public class PayDto {
+
     /**蹇呭~ 鏄惁鏄寜椤圭洰浠樻,0:鍚�,1:鏄�,榛樿:0*/
     private Integer type;
     /**蹇呭~ 璁㈠崟id*/
@@ -41,4 +42,13 @@
     private Integer couponCheckVersion = 0;
     /**闈炲繀濉� 浼樻儬鍒竔d闆嗗悎*/
     private List<String> userCouponIds;
+
+    /**ocr澶т紬鐐硅瘎璁㈠崟鍥剧墖鍦板潃*/
+    private String orderOCRImageUrl;
+
+    /**绗笁鏂硅鍗曠紪鍙�*/
+    private String otherOrderNo;
+
+    /**绗笁鏂瑰厬鎹㈢爜*/
+    private String redemptionCode;
 }

--
Gitblit v1.8.0