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

---
 java110-bean/src/main/java/com/java110/dto/product/ProductDto.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/product/ProductDto.java b/java110-bean/src/main/java/com/java110/dto/product/ProductDto.java
old mode 100644
new mode 100755
index c84aeef..7887457
--- a/java110-bean/src/main/java/com/java110/dto/product/ProductDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/product/ProductDto.java
@@ -15,7 +15,7 @@
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-public class ProductDto extends PageDto implements Serializable {
+public class ProductDto extends ProductActivityDto implements Serializable {
 
     private String productId;
     private String unitName;
@@ -42,6 +42,8 @@
     private List<String> carouselFigurePhotos;
 
     private List<ProductSpecValueDto> productSpecValues;
+
+    private ProductSpecValueDto defaultSpecValue;
 
 
     private Date createTime;
@@ -225,4 +227,12 @@
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public ProductSpecValueDto getDefaultSpecValue() {
+        return defaultSpecValue;
+    }
+
+    public void setDefaultSpecValue(ProductSpecValueDto defaultSpecValue) {
+        this.defaultSpecValue = defaultSpecValue;
+    }
 }

--
Gitblit v1.8.0