From cc1181b93c51c60a117846f9640d3f56370e67f3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 03 八月 2023 13:32:26 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGoodsPageVo.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGoodsPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGoodsPageVo.java
index 93c789c..8dbd687 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGoodsPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGoodsPageVo.java
@@ -1,6 +1,5 @@
package com.ruoyi.order.domain.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,16 +15,19 @@
@Data
public class AppUserOrderGoodsPageVo {
- @ApiModelProperty("订单商品id")
+ @ApiModelProperty(value="订单商品id")
private String orderGoodsId;
- @ApiModelProperty("商品id")
+ @ApiModelProperty(value="商品id")
private String goodsId;
- @ApiModelProperty("商品名称")
+ @ApiModelProperty(value="商品名称")
private String goodsName;
- @ApiModelProperty("商品图片")
+ @ApiModelProperty(value = "商品简介")
+ private String goodsIntroduction;
+
+ @ApiModelProperty(value="商品图片")
private String goodsPicture;
@ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
@@ -40,10 +42,10 @@
@ApiModelProperty(value = "商品实际价格")
private BigDecimal goodsRealPrice;
- @ApiModelProperty("周期标记")
+ @ApiModelProperty(value="周期标记")
private Integer cycleNumFlag;
- @ApiModelProperty("服务次数")
+ @ApiModelProperty(value="服务次数")
private Integer serviceNum;
--
Gitblit v1.7.1