From 03b606bcd56a04c6ea92b8af515a9fef97b84a7a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 10 十月 2023 16:54:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
index 9da7033..053da40 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
@@ -11,6 +11,8 @@
 @Data
 public class RefundMethodVo {
 
+    /** 鍙��鏀粯鏂瑰紡鏍囪瘑 */
+    private String payMethodId;
     /** 鍙��鏀粯鏂瑰紡缂栫爜 */
     private String payMethodNo;
     /** 鍙��鏀粯鏂瑰紡鍚嶇О */
@@ -22,11 +24,17 @@
     /**鏄惁鍒掓墸璁$畻锛�0鍚�1鏄�*/
     private Integer isExecute;
 
+    /** 杞崲鏂瑰紡鏍囪瘑 锛堝疄闄呴��娆炬柟寮忔爣璇嗭級*/
+    private String refundMethodId;
     /** 杞崲鏂瑰紡缂栫爜 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
-    private String refundNumberNo;
+    private String refundMethodNo;
     /** 杞崲鏂瑰紡鍚嶇О 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
-    private String refundNumberName;
+    private String refundMethodName;
     /** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/
     private BigDecimal refundTotal;
+    /**杞崲鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
+    private Integer isMoneyPayRefund;
+    /**杞崲鏄惁鍒掓墸璁$畻锛�0鍚�1鏄�*/
+    private Integer isExecuteRefund;
 
 }

--
Gitblit v1.8.0