From 609d91e1e62b1e8932b34b15b09baf02e7f09a93 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 09 十二月 2024 10:36:47 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng --- 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..b837117 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 String 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