From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test

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

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 196d775..97b8d87 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
@@ -1,5 +1,6 @@
 package com.hz.his.dto.order;
 
+import com.hz.his.dto.refund.RefundPreferentialDto;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -78,4 +79,7 @@
     //闈炲繀濉� 閲嶅彂鏍囪瘑
     private String resendRecordId;
 
+    /** 閫�娆句紭鎯� */
+    private RefundPreferentialDto refundPreferentialDto;
+
 }

--
Gitblit v1.8.0