From d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 22:11:24 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java
index c62cc57..ecbbc53 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java
@@ -8,6 +8,7 @@
import javax.validation.Valid;
import javax.validation.constraints.Digits;
import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.util.List;
@@ -33,7 +34,7 @@
@ApiModelProperty("商品单位")
private String unit;
- @ApiModelProperty("商品状态(1.上架 2.已下架 3.回收站)")
+ @ApiModelProperty("商品状态(1.出售中 2.已下架 3.回收站)")
private Integer status;
@ApiModelProperty("商品主图")
@@ -45,13 +46,20 @@
@ApiModelProperty("商品详情")
private String details;
+ @ApiModelProperty("商品详情()富文本")
+ private String goodsDescribe;
+
/**
* 配送方式（1.商家配送 2.快递物流）
*/
- @ApiModelProperty(value = "配送方式（1.自提 2.快递）", hidden = true)
- private Integer deliveryType;
+ @ApiModelProperty(value = "配送方式（1.自提 2.快递）")
+ private String deliveryType;
@ApiModelProperty("商品规格")
@Valid
private List<AddShopFlowerGoodsAttrVO> goodsAttrVOList;
+
+ @ApiModelProperty("商品分类")
+ @NotEmpty(groups = {AddGroup.class}, message = "商品分类不能为空")
+ private List<Long> categoryIds;
}
--
Gitblit v1.7.1