From ab0637e981ab4c85120ccde35ee24ec4abbe3e24 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 17 Oct 2025 17:20:15 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductMerchantCreateRequest.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductMerchantCreateRequest.java b/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductMerchantCreateRequest.java
index 85c8761..d829696 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductMerchantCreateRequest.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductMerchantCreateRequest.java
@@ -1,14 +1,18 @@
package com.oying.modules.pc.product.domain.dto;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
@Data
-public class ProductMerchantCreateRequest {
+public class ProductMerchantCreateRequest implements ProductCreateRequest {
+
+ private Long storeId;
@NotBlank
private String barcode;
@@ -43,10 +47,14 @@
private Integer height;
- private Integer allowReturns;
+ @ApiModelProperty(value = "是否支持退货")
+ private Integer returns;
- private List<ProductImageCreateRequest> imageList;
+ @ApiModelProperty(value = "是否支持自提")
+ private Integer selfPickup;
- private List<ProductLabelCreateRequest> labelList;
+ private List<ProductImageCreateRequest> images = new ArrayList<>();
+
+ private List<ProductLabelCreateRequest> labels = new ArrayList<>();
}
--
Gitblit v1.9.3