From 36ce1f3549df46609b4e3bc0bf0810bd0c85277e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 28 十一月 2024 17:15:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderVO.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderVO.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderVO.java
index 796f3d8..2e65707 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderVO.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.order.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -9,7 +10,7 @@
@Data
public class OrderVO {
@ApiModelProperty(value = "订单id")
- private Long id;
+ private Integer id;
@ApiModelProperty(value = "订单编号")
private String orderNumber;
@@ -17,11 +18,14 @@
@ApiModelProperty(value = "1待发货2待收货3待使用4已完成待评论5已取消6已退款7售后中8已完成已评论")
private Integer orderStatus;
- @ApiModelProperty(value = "商品图片")
- private List<String> goodsPics;
+ @ApiModelProperty(value = "商品封面（多张逗号隔开，最多三张））")
+ private String goodPics;
- @ApiModelProperty(value = "商品名称")
- private String goodsName;
+ @ApiModelProperty(value = "商品名称（多个名称逗号隔开））")
+ private String goodName;
+
+ @ApiModelProperty(value = "商品数量")
+ private Integer num;
@ApiModelProperty(value = "使用积分")
private BigDecimal point;
@@ -29,6 +33,5 @@
@ApiModelProperty(value = "实际支付价格")
private BigDecimal paymentAmount;
- @ApiModelProperty(value = "商品数量")
- private Integer num;
+
}
--
Gitblit v1.7.1