From 6e0a83c55db4bae4d23a4c281946bda1d610f678 Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Sat, 14 Jun 2025 12:32:31 +0800
Subject: [PATCH] 补充前次提交的遗漏内容,前次提交SHA:a6f4dd

---
 oying-system/src/main/java/com/oying/modules/pc/product/view/ProductMerchantSimpleView.java |   69 +++++++++++++++++++++++++++++++++-
 1 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/view/ProductMerchantSimpleView.java b/oying-system/src/main/java/com/oying/modules/pc/product/view/ProductMerchantSimpleView.java
index b558519..5c72d2a 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/view/ProductMerchantSimpleView.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/view/ProductMerchantSimpleView.java
@@ -1,5 +1,6 @@
 package com.oying.modules.pc.product.view;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -12,11 +13,73 @@
 @Data
 public class ProductMerchantSimpleView {
 
+    @ApiModelProperty(value = "ID")
     private Long productId;
+
+    @ApiModelProperty(value = "店铺ID")
+    private Long storeId;
+
+    @ApiModelProperty(value = "条形码")
+    private String barcode;
+
+    @ApiModelProperty(value = "商品名称")
     private String name;
-    private BigDecimal price;
-    private Integer stockQuantity;
-    private Integer sold;
+
+    @ApiModelProperty(value = "商品标题")
+    private String title;
+
+    @ApiModelProperty(value = "一级分类ID")
+    private Long categoryId;
+
+    @ApiModelProperty(value = "二级分类ID")
+    private Long secondCategoryId;
+
+    @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ApiModelProperty(value = "主图片")
+    private String mainImageId;
+
+    @ApiModelProperty(value = "主图地址")
+    private String mainImageUrl;
+
+    @ApiModelProperty(value = "商品描述")
+    private String description;
+
+    @ApiModelProperty(value = "销售价格")
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "库存数量")
+    private Integer stockQuantity;
+
+    @ApiModelProperty(value = "起售数量")
+    private Integer minPurchaseQuantity;
+
+    @ApiModelProperty(value = "预警库存")
+    private Integer warnStock;
+
+    @ApiModelProperty(value = "重量(单位:g)")
+    private Integer weight;
+
+    @ApiModelProperty(value = "宽度(单位:厘米)")
+    private Integer width;
+
+    @ApiModelProperty(value = "长度(单位:厘米)")
+    private Integer length;
+
+    @ApiModelProperty(value = "高度(单位:厘米)")
+    private Integer height;
+
+    @ApiModelProperty(value = "是否支持退货")
+    private Integer returns;
+
+    @ApiModelProperty(value = "是否支持自提")
+    private Integer selfPickup;
+
+    @ApiModelProperty(value = "是否删除")
+    private Integer deletedFlag;
+
+    @ApiModelProperty(value = "版本号")
+    private Long version;
+
 }

--
Gitblit v1.9.3