From bfdb3faf4f27df01718f58ac8c4ec0bcc092e7b6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 30 十一月 2024 18:50:47 +0800
Subject: [PATCH] 生成数据明细导出修改
---
ruoyi-system/src/main/java/com/ruoyi/system/export/TOrderSaleAndGoodsExportExcel.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/export/TOrderSaleAndGoodsExportExcel.java b/ruoyi-system/src/main/java/com/ruoyi/system/export/TOrderSaleAndGoodsExportExcel.java
index 8f6b175..9971c4d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/export/TOrderSaleAndGoodsExportExcel.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/export/TOrderSaleAndGoodsExportExcel.java
@@ -14,18 +14,17 @@
@ApiModel(value = "销售订单导出明细Excel")
public class TOrderSaleAndGoodsExportExcel implements Serializable {
- @Excel(width = 30,name = "订单编号",needMerge = true)
+ @Excel(width = 30,name = "订单编号")
private String orderNum;
- @Excel(width = 30,name = "下单日期",needMerge = true)
+ @Excel(width = 30,name = "下单日期")
private String createStrTime;
- @ExcelCollection(name = "菜品明细")
private List<TOrderSaleGoods> orderSaleGoods;
- @Excel(width = 30,name = "商品总价",needMerge = true)
+ @Excel(width = 30,name = "商品总价")
private BigDecimal goodsAmount;
- @Excel(width = 30,name = "支付方式",replace = {"现金_1","支付宝_2","微信_3","银行卡_4","其他_5"," _null"},needMerge = true)
+ @Excel(width = 30,name = "支付方式",replace = {"现金_1","支付宝_2","微信_3","银行卡_4","其他_5"," _null"})
private Integer payType;
}
--
Gitblit v1.7.1