From ec09e9f2c72ff37654076c327008ac89ed32a8c3 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期六, 24 六月 2023 17:44:11 +0800
Subject: [PATCH] 导入导出

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopOrderPageVo.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopOrderPageVo.java
index e582986..3d4dd4f 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopOrderPageVo.java
@@ -1,6 +1,7 @@
 package com.ruoyi.order.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -21,49 +22,65 @@
     @ApiModelProperty("订单id")
     private String orderId;
 
+    @Excel(name = "订单编号", width = 30)
     @ApiModelProperty("订单编号")
     private String orderNo;
 
     @ApiModelProperty(value = "用户id")
     private Long userId;
 
+    @Excel(name = "用户昵称", width = 30)
     @ApiModelProperty(value = "用户昵称")
     private String nickName;
 
+    @Excel(name = "用户姓名", width = 30)
     @ApiModelProperty(value = "用户姓名")
     private String userName;
 
     @ApiModelProperty("订单商品列表")
     private List<MgtOrderGoodsPageVo> mgtOrderGoodsPageVoList;
 
+    @Excel(name = "商品信息", width = 30)
+    @ApiModelProperty("商品信息")
+    private String goodsInfo;
+
+    @Excel(name = "订单金额", width = 30)
     @ApiModelProperty("订单金额")
     private BigDecimal orderMoney;
 
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
+    @Excel(name = "优惠金额", width = 30)
     @ApiModelProperty("优惠金额")
     private BigDecimal discountMoney;
 
+    @Excel(name = "应付金额", width = 30)
     @ApiModelProperty("应付金额")
     private BigDecimal receivableMoney;
 
+    @Excel(name = "订单实际支付金额", width = 30)
     @ApiModelProperty("订单实际支付金额")
     private BigDecimal payMoney;
 
+    @Excel(name = "订单未支付金额", width = 30)
     @ApiModelProperty("订单未支付金额")
     private BigDecimal unPaidMoney;
 
+    @Excel(name = "订单来源", width = 30)
     @ApiModelProperty("订单来源")
     private String orderFrom;
 
     @ApiModelProperty("核销店铺id")
     private Long shopId;
 
+    @Excel(name = "核销店铺", width = 30)
     @ApiModelProperty("核销店铺")
     private String shopName;
 
+    @Excel(name = "核销时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("核销时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date verifyTime;

--
Gitblit v1.7.1