From ecf9f0669734d4397aa1277f9a22f515aa410062 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 20 六月 2019 17:04:11 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBriefExtra.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBriefExtra.java b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBriefExtra.java
index 99d6e67..4a13682 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBriefExtra.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBriefExtra.java
@@ -31,7 +31,7 @@
private int collected; // 0-娌℃湁鏀惰棌 1-宸叉敹钘�
@Expose
- private int moneyType;////璧勯噾绫诲瀷1-杩� 2-濂�
+ private int moneyType;// 璧勯噾绫诲瀷 1-杩� 2-濂�
@Expose
private List<ClientTextStyleVO> labels;////鏍囩
@@ -44,6 +44,9 @@
@Expose
private boolean recommend = true; // 鏄惁鎺ㄨ崘
+
+ @Expose
+ private String spreadMoney;// 鎺ㄥ箍绾㈠寘
public int getMoneyType() {
@@ -150,4 +153,12 @@
this.recommend = recommend;
}
+ public String getSpreadMoney() {
+ return spreadMoney;
+ }
+
+ public void setSpreadMoney(String spreadMoney) {
+ this.spreadMoney = spreadMoney;
+ }
+
}
--
Gitblit v1.8.0