From c558c4f1130debfd785c74ff0e963afc6455f196 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 21 十一月 2018 16:30:42 +0800
Subject: [PATCH] Merge branch 'master' into dev1
---
fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBriefExtra.java | 4 +---
1 files changed, 1 insertions(+), 3 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 7bd1196..f051428 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
@@ -21,8 +21,7 @@
@Expose
private String tbToken;
@Expose
- private int collected; // 0-娌℃湁鏀惰棌 1-宸叉敹钘�
-
+ private int collected; // 0-娌℃湁鏀惰棌 1-宸叉敹钘�
public String getTbToken() {
return tbToken;
@@ -88,5 +87,4 @@
this.collected = collected;
}
-
}
--
Gitblit v1.8.0