From 4eda7aa2651445d763afbe0341839b87673cb954 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期五, 03 九月 2021 23:27:36 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/product/ProductDto.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 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 b0af081..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
@@ -1,6 +1,7 @@
package com.java110.dto.product;
import com.java110.dto.PageDto;
+import com.java110.dto.productSpecValue.ProductSpecValueDto;
import java.io.Serializable;
import java.util.Date;
@@ -14,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;
@@ -25,15 +26,24 @@
private String postage;
private String prodName;
private String state;
+ private String stateName;
private String keyword;
private String prodDesc;
private String categoryId;
+ private String categoryName;
private String content;
private String coverPhoto;
+ private String stock;
+ private String sales;
+
private List<String> carouselFigurePhotos;
+
+ private List<ProductSpecValueDto> productSpecValues;
+
+ private ProductSpecValueDto defaultSpecValue;
private Date createTime;
@@ -177,4 +187,52 @@
public void setCarouselFigurePhotos(List<String> carouselFigurePhotos) {
this.carouselFigurePhotos = carouselFigurePhotos;
}
+
+ public List<ProductSpecValueDto> getProductSpecValues() {
+ return productSpecValues;
+ }
+
+ public void setProductSpecValues(List<ProductSpecValueDto> productSpecValues) {
+ this.productSpecValues = productSpecValues;
+ }
+
+ public String getCategoryName() {
+ return categoryName;
+ }
+
+ public void setCategoryName(String categoryName) {
+ this.categoryName = categoryName;
+ }
+
+ public String getStock() {
+ return stock;
+ }
+
+ public void setStock(String stock) {
+ this.stock = stock;
+ }
+
+ public String getSales() {
+ return sales;
+ }
+
+ public void setSales(String sales) {
+ this.sales = sales;
+ }
+
+ public String getStateName() {
+ return stateName;
+ }
+
+ 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