From 982313135d1c239fe3b20e4c5664781f92d40aca Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 31 Jul 2025 17:17:39 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductMerchantUpdateRequest.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductMerchantUpdateRequest.java b/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductMerchantUpdateRequest.java
index 734cb8f..371ff04 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductMerchantUpdateRequest.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/domain/dto/ProductMerchantUpdateRequest.java
@@ -1,14 +1,17 @@
package com.oying.modules.pc.product.domain.dto;
+import com.oying.modules.pc.product.domain.ProductLabel;
+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 ProductMerchantUpdateRequest {
+
+ private Long productId;
private String barcode;
@@ -36,10 +39,22 @@
private Integer height;
- private Integer allowReturns;
+ @ApiModelProperty(value = "是否支持退货")
+ private Integer returns;
- private List<ProductImageCreateRequest> imageList;
+ @ApiModelProperty(value = "是否支持自提")
+ private Integer selfPickup;
- private List<ProductLabelCreateRequest> specList;
+ private List<Long> deletedImageIds = new ArrayList<>();
+
+ private List<ProductImageUpdateRequest> updatedImages = new ArrayList<>();
+
+ private List<ProductImageCreateRequest> newImages = new ArrayList<>();
+
+ private List<Long> deletedLabelIds = new ArrayList<>();
+
+ private List<ProductLabel> updatedLabels = new ArrayList<>();
+
+ private List<ProductLabel> newLabels = new ArrayList<>();
}
--
Gitblit v1.9.3