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/MgtMemberOrderPageVo.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberOrderPageVo.java
index 4e33edc..a948648 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberOrderPageVo.java
@@ -24,33 +24,33 @@
@ApiModelProperty(value = "订单id")
private String orderId;
- @Excel(name = "订单编号", width = 30)
+ @Excel(name = "订单编号", width = 30, sort = 1)
@ApiModelProperty(value="订单编号")
private String orderNo;
- @Excel(name = "核销门店", width = 30)
+ @Excel(name = "核销门店", width = 30, sort = 3)
@ApiModelProperty(value="核销门店")
private String shopName;
- @Excel(name = "商品信息", width = 30)
+ @Excel(name = "商品信息", width = 30, sort = 4)
@ApiModelProperty(value="商品信息")
private String goodsInfo;
- @Excel(name = "订单状态", width = 30)
+ @Excel(name = "订单状态", width = 30, sort = 10)
@ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
private String orderStatus;
- @Excel(name = "订单总价", width = 30)
+ @Excel(name = "订单总价", width = 30, sort = 5)
@ApiModelProperty(value = "订单总价")
@JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderMoney;
- @Excel(name = "优惠券抵扣", width = 30)
+ @Excel(name = "优惠券抵扣", width = 30, sort = 7)
@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;
@@ -59,7 +59,7 @@
@JsonSerialize(using = ToStringSerializer.class)
private BigDecimal payMoney;
- @Excel(name = "订单实收金额", width = 30)
+ @Excel(name = "订单实收金额", width = 30, sort = 8)
@ApiModelProperty(value = "实收金额")
@JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receiveMoney;
@@ -69,12 +69,12 @@
@JsonSerialize(using = ToStringSerializer.class)
private BigDecimal unPaidMoney;
- @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 9)
@ApiModelProperty(value="创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @Excel(name = "订单来源", width = 30)
+ @Excel(name = "订单来源", width = 30, sort = 2)
@ApiModelProperty(value="订单来源")
private String orderFromDesc;
--
Gitblit v1.7.1