From ead65cd9b15cd574f4e37c3376c7447efea53935 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 09 九月 2024 20:27:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2

---
 src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java |    5 +++++
 1 files changed, 5 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..0a30d16 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,9 @@
 
     @ApiModelProperty(value = "审核时间")
     private LocalDateTime auditTime;
+
+    @ApiModelProperty(value = "售后类型")
+    @DictTrans(target = "salesTypeStr", codeType = "after_sale_type")
+    private String salesType;
+    private String salesTypeStr;
 }

--
Gitblit v1.9.3