From b9903ead016b8b1aa68eb04b48fca3b53fdab0d3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 30 十二月 2024 10:42:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4

---
 src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java
index 26f7399..406528e 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java
@@ -96,4 +96,15 @@
 
     @ApiModelProperty(value = "审核时间")
     private LocalDateTime auditTime;
+
+    @ApiModelProperty(value = "售后类型")
+    @DictTrans(target = "salesTypeStr", codeType = "after_sale_type")
+    private String salesType;
+    private String salesTypeStr;
+
+    @ApiModelProperty(value = "真实成交价格/每扎")
+    private BigDecimal realPrice;
+
+    @ApiModelProperty(value = "真实成交总价格")
+    private BigDecimal realTotal;
 }

--
Gitblit v1.9.3