From 4f97bdbaadcdc19df9dfb0971b930d799c4aeddc Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 13 三月 2025 14:52:26 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java
index bf204f3..8ec9ae5 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java
@@ -27,6 +27,18 @@
private String orderType;
/**
+ * 配送方式
+ */
+ @Excel(name = "配送方式", readConverterExp = "1=快递,2=自提")
+ private String distributionMode;
+
+ /**
+ * 收货地址
+ */
+ @Excel(name = "收货地址")
+ private String address;
+
+ /**
* 下单时间
*/
@Excel(name = "下单时间")
@@ -61,8 +73,14 @@
/**
* 成本价
*/
- @Excel(name = "成本价")
- private BigDecimal costPrice;
+ @Excel(name = "公司运营成本")
+ private BigDecimal companyCostPrice;
+
+ /**
+ * 成本价
+ */
+ @Excel(name = "门店、供应商成本")
+ private BigDecimal supplierCostPrice;
/**
* 支付金额
@@ -109,4 +127,6 @@
*/
@Excel(name = "市区划代码")
private String cityCode;
+
+ private String addressJson;
}
--
Gitblit v1.7.1