From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/entity/jd/JDGoods.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 1aa1e69..529c977 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
@@ -16,15 +16,15 @@
* @author Administrator
*
*/
-public class JDGoods implements Serializable{
+public class JDGoods implements Serializable {
/**
*
*/
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
private JDCategoryInfo categoryInfo;// 绫荤洰淇℃伅
private Long comments;// 璇勮鏁�
private JDCommissionInfo commissionInfo;// 浣ｉ噾淇℃伅
- private JDCouponInfo couponInfo;// 浼樻儬鍒镐俊鎭紝杩斿洖鍐呭涓虹┖璇存槑璇KU鏃犲彲鐢ㄤ紭鎯犲埜
+ private List<JDCouponInfo> couponInfoList;// 浼樻儬鍒镐俊鎭紝杩斿洖鍐呭涓虹┖璇存槑璇KU鏃犲彲鐢ㄤ紭鎯犲埜
private BigDecimal goodCommentsShare;// 鍟嗗搧濂借瘎鐜�
private List<String> imageList;// 鍥剧墖淇℃伅
private Long inOrderCount30Days;// 30澶╁紩鍗曟暟閲�
@@ -42,9 +42,9 @@
private JDPingouInfo pinGouInfo;// 鎷艰喘淇℃伅
private Long totalCount;// 鏈夋晥鍟嗗搧鎬绘暟閲�
private Integer isFreeShipping; // 鏄惁鍖呴偖(1:鏄�,0:鍚�,2:鑷惀鍟嗗搧閬典粠涓荤珯鍖呴偖瑙勫垯)
-
- private BigDecimal commissionPlus;// 浣ｉ噾姣斾緥 : 浜笢plus浼氬憳
-
+
+ private BigDecimal commissionPlus;// 浣ｉ噾姣斾緥 : 浜笢plus浼氬憳
+
public JDCategoryInfo getCategoryInfo() {
return categoryInfo;
}
@@ -69,12 +69,12 @@
this.commissionInfo = commissionInfo;
}
- public JDCouponInfo getCouponInfo() {
- return couponInfo;
+ public List<JDCouponInfo> getCouponInfoList() {
+ return couponInfoList;
}
- public void setCouponInfo(JDCouponInfo couponInfo) {
- this.couponInfo = couponInfo;
+ public void setCouponInfoList(List<JDCouponInfo> couponInfoList) {
+ this.couponInfoList = couponInfoList;
}
public BigDecimal getGoodCommentsShare() {
--
Gitblit v1.8.0