From 2e7fd14c34320fb0c1dc26432bed86a21c008eeb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 17 一月 2022 17:46:58 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/groupBuyProduct/GroupBuyProductDto.java |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/groupBuyProduct/GroupBuyProductDto.java b/java110-bean/src/main/java/com/java110/dto/groupBuyProduct/GroupBuyProductDto.java
old mode 100644
new mode 100755
index f4528cd..cca5177
--- a/java110-bean/src/main/java/com/java110/dto/groupBuyProduct/GroupBuyProductDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/groupBuyProduct/GroupBuyProductDto.java
@@ -1,7 +1,9 @@
 package com.java110.dto.groupBuyProduct;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.groupBuyProductSpec.GroupBuyProductSpecDto;
 import com.java110.dto.product.ProductDto;
+import com.java110.dto.productSpecValue.ProductSpecValueDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -26,6 +28,13 @@
     private String state;
     private String storeId;
     private String batchId;
+
+    private Date batchStartTime;
+    private Date batchEndTime;
+
+    private GroupBuyProductSpecDto defaultGroupBuyProductSpec;
+
+    private List<GroupBuyProductSpecDto> groupBuyProductSpecs;
 
 
 
@@ -125,4 +134,35 @@
     }
 
 
+    public List<GroupBuyProductSpecDto> getGroupBuyProductSpecs() {
+        return groupBuyProductSpecs;
+    }
+
+    public void setGroupBuyProductSpecs(List<GroupBuyProductSpecDto> groupBuyProductSpecs) {
+        this.groupBuyProductSpecs = groupBuyProductSpecs;
+    }
+
+    public Date getBatchStartTime() {
+        return batchStartTime;
+    }
+
+    public void setBatchStartTime(Date batchStartTime) {
+        this.batchStartTime = batchStartTime;
+    }
+
+    public Date getBatchEndTime() {
+        return batchEndTime;
+    }
+
+    public void setBatchEndTime(Date batchEndTime) {
+        this.batchEndTime = batchEndTime;
+    }
+
+    public GroupBuyProductSpecDto getDefaultGroupBuyProductSpec() {
+        return defaultGroupBuyProductSpec;
+    }
+
+    public void setDefaultGroupBuyProductSpec(GroupBuyProductSpecDto defaultGroupBuyProductSpec) {
+        this.defaultGroupBuyProductSpec = defaultGroupBuyProductSpec;
+    }
 }

--
Gitblit v1.8.0