From 97d7e38d0d0dc419672f9a6dbb12ac0e7f145553 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期二, 24 十月 2023 17:55:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx-1023-营销优惠券新版' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
index 4e5fccc..7b0dc41 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
@@ -22,4 +22,19 @@
     private String cardEquityId;
     /**闈炲繀濉� 鍗″寘鏍囪瘑:鍗¢」鏀粯蹇呬紶*/
     private String userCardId;
+
+    /**
+     * 鏍囪瀛楁锛岄粯璁�0
+     * 鏀粯鏂瑰紡涓虹Н鍒嗘椂锛�
+     * isDel=100锛屽垯phis杩欒竟闇�瑕佹墸鍑忕敤鎴风Н鍒�
+     * isDel=101锛屽垯phis杩欒竟涓嶉渶瑕佹墸鍑忕敤鎴风Н鍒�
+     */
+    private Integer isDel = 0;
+
+    /**闈炲繀濉� 绗笁鏂硅鍗曠紪鍙�*/
+    private String otherOrderNo;
+    /**闈炲繀濉� 娆$骇璁㈠崟鍙锋垨鍏戞崲鐮�*/
+    private String assistOrderNo;
+    /**闈炲繀濉� OCR璇嗗埆鍥剧墖閾炬帴*/
+    private String ocrImageUrl;
 }

--
Gitblit v1.8.0