From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java |    7 +++++++
 1 files changed, 7 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..48e7c8b 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;
@@ -72,10 +73,16 @@
     /**蹇呭~:閫�璐圭粺璁$被鍨�(RefundRecord)*/
     private String refundStatistics;
 
+    /**鏄惁褰掕繕鍟嗗搧 0=鍚� 1=鏄�*/
+    private Integer isReturnBack;
+
     /**澶囩敤鍙傛暟*/
     //鎬昏鍗曢寤烘爣璇�
     private String hisOrderId;
     //闈炲繀濉� 閲嶅彂鏍囪瘑
     private String resendRecordId;
 
+    /** 閫�娆句紭鎯� */
+    private RefundPreferentialDto refundPreferentialDto;
+
 }

--
Gitblit v1.8.0