From add86a49cc69b6882500c95dd67a2ac826c35526 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 26 七月 2023 20:16:51 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopOrderPageVo.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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 3d4dd4f..a463beb 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
@@ -19,11 +19,11 @@
@Data
public class MgtShopOrderPageVo {
- @ApiModelProperty("订单id")
+ @ApiModelProperty(value="订单id")
private String orderId;
@Excel(name = "订单编号", width = 30)
- @ApiModelProperty("订单编号")
+ @ApiModelProperty(value="订单编号")
private String orderNo;
@ApiModelProperty(value = "用户id")
@@ -37,51 +37,51 @@
@ApiModelProperty(value = "用户姓名")
private String userName;
- @ApiModelProperty("订单商品列表")
+ @ApiModelProperty(value="订单商品列表")
private List<MgtOrderGoodsPageVo> mgtOrderGoodsPageVoList;
@Excel(name = "商品信息", width = 30)
- @ApiModelProperty("商品信息")
+ @ApiModelProperty(value="商品信息")
private String goodsInfo;
@Excel(name = "订单金额", width = 30)
- @ApiModelProperty("订单金额")
+ @ApiModelProperty(value="订单金额")
private BigDecimal orderMoney;
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("创建时间")
+ @ApiModelProperty(value="创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@Excel(name = "优惠金额", width = 30)
- @ApiModelProperty("优惠金额")
+ @ApiModelProperty(value="优惠金额")
private BigDecimal discountMoney;
@Excel(name = "应付金额", width = 30)
- @ApiModelProperty("应付金额")
+ @ApiModelProperty(value="应付金额")
private BigDecimal receivableMoney;
@Excel(name = "订单实际支付金额", width = 30)
- @ApiModelProperty("订单实际支付金额")
+ @ApiModelProperty(value="订单实际支付金额")
private BigDecimal payMoney;
@Excel(name = "订单未支付金额", width = 30)
- @ApiModelProperty("订单未支付金额")
+ @ApiModelProperty(value="订单未支付金额")
private BigDecimal unPaidMoney;
@Excel(name = "订单来源", width = 30)
- @ApiModelProperty("订单来源")
+ @ApiModelProperty(value="订单来源")
private String orderFrom;
- @ApiModelProperty("核销店铺id")
+ @ApiModelProperty(value="核销店铺id")
private Long shopId;
@Excel(name = "核销店铺", width = 30)
- @ApiModelProperty("核销店铺")
+ @ApiModelProperty(value="核销店铺")
private String shopName;
@Excel(name = "核销时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("核销时间")
+ @ApiModelProperty(value="核销时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date verifyTime;
}
--
Gitblit v1.7.1