From c9a112ea32e72aacd025f2ecb3024e72528c2e0c Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 09 三月 2023 10:40:53 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 4 +++-
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java | 4 +++-
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
index 993e363..6dcb6bb 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
@@ -22,7 +22,9 @@
private Integer refundNum;
/** 瀹為��閲戦 */
private BigDecimal refundMoney;
- /** 瀹為��鍘熷洜 */
+ /** 閫�娆惧師鍥狅紙鍛樺伐锛� */
+ private String remarks;
+ /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
private String refundReason;
/** 閫�娆句簩绾у瓙璁㈠崟淇℃伅闆嗗悎 */
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
index 400e7dd..6180767 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
@@ -21,6 +21,8 @@
private Integer refundNum;
/** 瀹為��閲戦 */
private BigDecimal refundMoney;
- /** 瀹為��鍘熷洜 */
+ /** 閫�娆惧師鍥狅紙鍛樺伐锛� */
+ private String remarks;
+ /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
private String refundReason;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
index 3f58f4a..6ce4870 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
@@ -14,8 +14,10 @@
/** 閫�娆炬柟寮忛泦鍚� */
private List<OrderPayMethodDto> refundPayMethod;
- /** 澶囨敞 */
+ /** 閫�娆惧娉紙鍛樺伐锛� */
private String remarks;
+ /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
+ private String refundReason;
/** 閫�娆句俊鎭泦鍚� */
private List<OrderItemRefundDto> refundList;
/** 璁㈠崟id */
--
Gitblit v1.8.0