From a458dab7990cf8f9d9f834a19db4f2d8b549b467 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 23 四月 2024 14:25:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-fwq-积分抵扣现金' into master-fwq-积分抵扣现金
---
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