From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/jd/JDGoods.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 8021529..1aa1e69 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
@@ -20,8 +20,7 @@
/**
*
*/
- private static final long serialVersionUID = 1L;
-
+ private static final long serialVersionUID = 1L;
private JDCategoryInfo categoryInfo;// 绫荤洰淇℃伅
private Long comments;// 璇勮鏁�
private JDCommissionInfo commissionInfo;// 浣ｉ噾淇℃伅
@@ -44,7 +43,8 @@
private Long totalCount;// 鏈夋晥鍟嗗搧鎬绘暟閲�
private Integer isFreeShipping; // 鏄惁鍖呴偖(1:鏄�,0:鍚�,2:鑷惀鍟嗗搧閬典粠涓荤珯鍖呴偖瑙勫垯)
-
+ private BigDecimal commissionPlus;// 浣ｉ噾姣斾緥 : 浜笢plus浼氬憳
+
public JDCategoryInfo getCategoryInfo() {
return categoryInfo;
}
@@ -212,4 +212,12 @@
public void setIsFreeShipping(Integer isFreeShipping) {
this.isFreeShipping = isFreeShipping;
}
+
+ public BigDecimal getCommissionPlus() {
+ return commissionPlus;
+ }
+
+ public void setCommissionPlus(BigDecimal commissionPlus) {
+ this.commissionPlus = commissionPlus;
+ }
}
--
Gitblit v1.8.0