From 263a13a155ec759b1cb26cc00edd640f4d2e747c Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 19 九月 2024 16:46:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' 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