From d36bb8b4ea60d1bb0d46bbc0c5dbc02aca86afcd Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 05 六月 2024 08:38:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java
index bf3cb60..71d69d4 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java
@@ -56,7 +56,6 @@
private String orderRemark;
@ApiModelProperty(value = "发货时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime deliveryTime;
@ApiModelProperty(value = "确认收货时间")
@@ -102,4 +101,13 @@
@ApiModelProperty(value = "开票状态 开票状态 1 待开票，2待审核，3 已开票，4 拒绝")
private Integer invoiceStatus;
+ @ApiModelProperty(value = "商品名称")
+ private String skuName;
+
+ @ApiModelProperty(value = "封面图")
+ private String coverPic;
+
+ @ApiModelProperty(value = "商品价格")
+ private BigDecimal price;
+
}
--
Gitblit v1.7.1