From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGoodsPageVo.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 614793c..cec2b25 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,7 @@
package com.ruoyi.order.domain.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -25,6 +26,12 @@
@ApiModelProperty(value="商品名称")
private String goodsName;
+ @ApiModelProperty(value = "商品简介")
+ private String goodsIntroduction;
+
+ @ApiModelProperty(value="商品标签")
+ private String goodsTag;
+
@ApiModelProperty(value="商品图片")
private String goodsPicture;
@@ -35,9 +42,11 @@
private Integer buyNum;
@ApiModelProperty(value = "商品售价")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal goodsPrice;
@ApiModelProperty(value = "商品实际价格")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal goodsRealPrice;
@ApiModelProperty(value="周期标记")
@@ -46,5 +55,6 @@
@ApiModelProperty(value="服务次数")
private Integer serviceNum;
-
+ @ApiModelProperty(value = "优惠券id")
+ private String couponId;
}
--
Gitblit v1.7.1