From 0e50884553dd11fa72101f23ac51143c9f98a871 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期三, 22 五月 2024 11:37:15 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-智能导诊

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java
index dc7d8e4..db7eaf3 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java
@@ -7,31 +7,25 @@
 /**
  * @Author
  */
-
 @Data
 public class OrderRefundNoteDto {
-    //蹇呭~
-    private String id;
+    //閫�娆炬柟寮忔�昏〃鏍囪瘑锛屽繀瑕�
+    private String refundRecordMethodId;
+
     //鏀粯鎬婚噾棰�  蹇呭~
     private BigDecimal paymentTotal;
+    //鏀粯鎶垫墸閲戦  蹇呭~
+    private BigDecimal paymentDeductionTotal;
     // 鏀粯鏂瑰紡缂栧彿 蹇呭~
     private String paymentNumberNo;
     //鏀粯鏂瑰紡鍚嶇О 蹇呭~
     private String paymentName;
+
     //閫�娆捐矾寰�" 蹇呭~
     private Integer refundroute;
     //閫�娆炬柟寮忕紪鍙� 蹇呭~
     private String refundNumberNo;
     //閫�娆炬柟寮忓悕绉� 蹇呭~
     private String refundName;
-    //鍙湁鍦ㄨ浆鍌ㄥ�奸噾鐨勬椂鍊欐墠鏈夎繖鐜╂剰
-    //閫�娆惧偍鍊奸噾閲戦
-    private BigDecimal refundStoredTotal;
-    //閫�娆剧姸鎬�
-    private Integer refundStatus;
-    //澶囨敞
-    private String remarks;
-    //绾夸笅閫�娆惧嚟璇佸浘鐗囧湴鍧�   鏍煎紡鈥滃浘鐗囦竴锛屽浘鐗囦簩鈥�
-    private String imageList;
 
 }

--
Gitblit v1.8.0