From 6bc568611d0430c94f30e41736d7809e32a64273 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 11 九月 2024 15:18:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java | 14 ++++++++++++++
1 files changed, 14 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 d722c31..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
@@ -53,6 +53,12 @@
@ApiModelProperty(value = "供应商名称")
private String supplierName;
+ @ApiModelProperty(value = "供应商价格")
+ private BigDecimal supplierPrice;
+
+ @ApiModelProperty(value = "合伙人加价")
+ private BigDecimal markupPartner;
+
@ApiModelProperty(value = "商品售价")
private BigDecimal price;
@@ -87,4 +93,12 @@
@ApiModelProperty(value = "平台回复")
private String remarks;
+
+ @ApiModelProperty(value = "审核时间")
+ private LocalDateTime auditTime;
+
+ @ApiModelProperty(value = "售后类型")
+ @DictTrans(target = "salesTypeStr", codeType = "after_sale_type")
+ private String salesType;
+ private String salesTypeStr;
}
--
Gitblit v1.9.3