From 38596b03540250dd7de85c49f53ece5dd6bfe5b7 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 10 十一月 2022 13:19:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsAttrVO.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsAttrVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsAttrVO.java
index f6db251..b346cfa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsAttrVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsAttrVO.java
@@ -21,10 +21,27 @@
private Long goodsAttrId;
@ApiModelProperty("商品规格")
- private String goodsAttr;
+ private String goodsAttrName;
- @ApiModelProperty("规格价格")
- @Min(groups = {AddGroup.class}, value = 0, message = "价格最小值为0")
+ @ApiModelProperty("原价")
+ @Min(groups = {AddGroup.class}, value = 0, message = "原价最小值为0")
@Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
- private BigDecimal attrPrice;
+ private BigDecimal price;
+
+ @ApiModelProperty("包邮价")
+// @Min(groups = {AddGroup.class}, value = 0, message = "包邮价最小值为0")
+// @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
+ private BigDecimal freeShippingPrice;
+
+ @ApiModelProperty("拼单价")
+// @Min(groups = {AddGroup.class}, value = 0, message = "拼单价最小值为0")
+// @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
+ private BigDecimal collatePrice;
+
+ @ApiModelProperty("商品规格图")
+ private String attrPic;
+
+ @ApiModelProperty("库存")
+ private Integer stock;
+
}
--
Gitblit v1.7.1