From 1c8b2509fe7d990fd0b9f9ed6b338c6203d54758 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 02 九月 2024 17:04:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java | 9 +++++++++
1 files changed, 9 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..26f7399 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,7 @@
@ApiModelProperty(value = "平台回复")
private String remarks;
+
+ @ApiModelProperty(value = "审核时间")
+ private LocalDateTime auditTime;
}
--
Gitblit v1.9.3