From 755262ba9a1a3c0573a0e910bbd0a353e9e2a2c5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 16:39:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/groupBuyProductSpec/GroupBuyProductSpecDto.java |   75 +++++++++++++++++++++++++++----------
 1 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/groupBuyProductSpec/GroupBuyProductSpecDto.java b/java110-bean/src/main/java/com/java110/dto/groupBuyProductSpec/GroupBuyProductSpecDto.java
old mode 100644
new mode 100755
index c2c8230..f57c5d3
--- a/java110-bean/src/main/java/com/java110/dto/groupBuyProductSpec/GroupBuyProductSpecDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/groupBuyProductSpec/GroupBuyProductSpecDto.java
@@ -1,6 +1,8 @@
 package com.java110.dto.groupBuyProductSpec;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.productSpecValue.ProductSpecValueDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,15 +14,17 @@
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-public class GroupBuyProductSpecDto extends PageDto implements Serializable {
+public class GroupBuyProductSpecDto extends ProductSpecValueDto implements Serializable {
 
+    private String valueId;
     private String specId;
-private String groupSales;
-private String productId;
-private String groupPrice;
-private String defaultShow;
-private String storeId;
-private String groupStock;
+    private String groupSales;
+    private String productId;
+    private String[] productIds;
+    private String groupPrice;
+    private String defaultShow;
+    private String storeId;
+    private String groupStock;
 
 
     private Date createTime;
@@ -31,43 +35,56 @@
     public String getSpecId() {
         return specId;
     }
-public void setSpecId(String specId) {
+
+    public void setSpecId(String specId) {
         this.specId = specId;
     }
-public String getGroupSales() {
+
+    public String getGroupSales() {
         return groupSales;
     }
-public void setGroupSales(String groupSales) {
+
+    public void setGroupSales(String groupSales) {
         this.groupSales = groupSales;
     }
-public String getProductId() {
+
+    public String getProductId() {
         return productId;
     }
-public void setProductId(String productId) {
+
+    public void setProductId(String productId) {
         this.productId = productId;
     }
-public String getGroupPrice() {
+
+    public String getGroupPrice() {
         return groupPrice;
     }
-public void setGroupPrice(String groupPrice) {
+
+    public void setGroupPrice(String groupPrice) {
         this.groupPrice = groupPrice;
     }
-public String getDefaultShow() {
+
+    public String getDefaultShow() {
         return defaultShow;
     }
-public void setDefaultShow(String defaultShow) {
+
+    public void setDefaultShow(String defaultShow) {
         this.defaultShow = defaultShow;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getGroupStock() {
+
+    public String getGroupStock() {
         return groupStock;
     }
-public void setGroupStock(String groupStock) {
+
+    public void setGroupStock(String groupStock) {
         this.groupStock = groupStock;
     }
 
@@ -87,4 +104,22 @@
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String[] getProductIds() {
+        return productIds;
+    }
+
+    public void setProductIds(String[] productIds) {
+        this.productIds = productIds;
+    }
+
+    @Override
+    public String getValueId() {
+        return valueId;
+    }
+
+    @Override
+    public void setValueId(String valueId) {
+        this.valueId = valueId;
+    }
 }

--
Gitblit v1.8.0