From bb95ec391d10f04702822705ecb82c027e849b98 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 15 八月 2023 19:16:09 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopAllOrderPageVo.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopAllOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopAllOrderPageVo.java
index dacb0dd..be3d916 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopAllOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopAllOrderPageVo.java
@@ -22,45 +22,45 @@
@ApiModelProperty(value="订单id")
private String orderId;
- @Excel(name = "订单编号", width = 30)
+ @Excel(name = "订单号", width = 30, sort = 1)
@ApiModelProperty(value="订单编号")
private String orderNo;
@ApiModelProperty(value = "用户id")
private Long userId;
- @Excel(name = "客户信息", width = 30)
+ @Excel(name = "客户信息", width = 30, sort = 2)
@ApiModelProperty(value = "客户信息")
private String userInfo;
@ApiModelProperty(value="订单商品列表")
private List<MgtOrderGoodsPageVo> mgtOrderGoodsPageVoList;
- @Excel(name = "商品信息", width = 30)
+ @Excel(name = "商品信息", width = 30, sort = 3)
@ApiModelProperty(value="商品信息")
private String goodsInfo;
- @Excel(name = "订单金额", width = 30)
+ @Excel(name = "订单金额", width = 30, sort = 4)
@ApiModelProperty(value="订单金额")
@JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderMoney;
- @Excel(name = "优惠金额", width = 30)
+ @Excel(name = "优惠金额", width = 30, sort = 5)
@ApiModelProperty(value="优惠金额")
@JsonSerialize(using = ToStringSerializer.class)
private BigDecimal discountMoney;
- @Excel(name = "应付金额", width = 30)
+ @Excel(name = "应收金额", width = 30, sort = 6)
@ApiModelProperty(value="应付金额")
@JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableMoney;
- @Excel(name = "订单实际支付金额", width = 30)
+ @Excel(name = "订单实收金额", width = 30, sort = 7)
@ApiModelProperty(value="订单实际支付金额")
@JsonSerialize(using = ToStringSerializer.class)
private BigDecimal payMoney;
- @Excel(name = "订单来源", width = 30)
+ @Excel(name = "订单来源", width = 30, sort = 8)
@ApiModelProperty(value="订单来源")
private String orderFrom;
--
Gitblit v1.7.1