From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java
index 2d1061f..98b34a9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerGoodsVO.java
@@ -70,10 +70,15 @@
private BigDecimal originalPrice;
/**
- * 商品现价
+ * 包邮价
*/
- @ApiModelProperty("商品现价")
- private BigDecimal price;
+ @ApiModelProperty("包邮价")
+ private BigDecimal freeShippingPrice;
+ /**
+ * 拼单价
+ */
+ @ApiModelProperty("拼单价")
+ private BigDecimal collatePrice;
/**
* 商品单位
@@ -130,7 +135,15 @@
/**
* 浏览量
*/
+ @ApiModelProperty("浏览量")
private Integer viewNum;
+
+
+ /**
+ * 评价数量
+ */
+ @ApiModelProperty("评价数量")
+ private Integer evaluateNum;
/**
* 商品规格列表
@@ -141,4 +154,10 @@
@ApiModelProperty("商品分类")
@NotEmpty(groups = {AddGroup.class}, message = "商品分类不能为空")
private List<Long> categoryIds;
+
+
+ @ApiModelProperty("商品描述")
+ private String goodsDescribe;
}
+
+
--
Gitblit v1.7.1