From 7a512d4a8b10fad9fb0aa75d6105955f033e1ee9 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期五, 07 六月 2024 15:37:22 +0800 Subject: [PATCH] Merge branch 'master-fwq-爆款活动2.0' into master-test --- phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 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 c00f05c..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,27 +7,25 @@ /** * @Author */ - @Data public class OrderRefundNoteDto { + //閫�娆炬柟寮忔�昏〃鏍囪瘑锛屽繀瑕� + private String refundRecordMethodId; - private String id; - //鏀粯鎬婚噾棰� + //鏀粯鎬婚噾棰� 蹇呭~ 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