修改

xuhy

4 天以前 508f3e225df87e0da974424981e7782fc5ce875c

 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;
}