From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/jd/JDGoods.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/jd/JDGoods.java b/fanli/src/main/java/com/yeshi/fanli/entity/jd/JDGoods.java
index 378d37e..cb488cb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/jd/JDGoods.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/jd/JDGoods.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.entity.jd;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;
@@ -15,7 +16,11 @@
* @author Administrator
*
*/
-public class JDGoods {
+public class JDGoods implements Serializable{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
private JDCategoryInfo categoryInfo;// 绫荤洰淇℃伅
private Long comments;// 璇勮鏁�
private JDCommissionInfo commissionInfo;// 浣ｉ噾淇℃伅
@@ -36,7 +41,8 @@
private String owner;// g=鑷惀锛宲=pop
private JDPingouInfo pinGouInfo;// 鎷艰喘淇℃伅
private Long totalCount;// 鏈夋晥鍟嗗搧鎬绘暟閲�
- private String picUrl;
+ private Integer isFreeShipping; // 鏄惁鍖呴偖(1:鏄�,0:鍚�,2:鑷惀鍟嗗搧閬典粠涓荤珯鍖呴偖瑙勫垯)
+
public JDCategoryInfo getCategoryInfo() {
return categoryInfo;
@@ -197,4 +203,12 @@
public void setPicUrl(String picUrl) {
this.picUrl = picUrl;
}
+
+ public Integer getIsFreeShipping() {
+ return isFreeShipping;
+ }
+
+ public void setIsFreeShipping(Integer isFreeShipping) {
+ this.isFreeShipping = isFreeShipping;
+ }
}
--
Gitblit v1.8.0