From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
index 6a71e4c..68a8b4c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
@@ -224,6 +224,8 @@
if (!StringUtil.isNullOrEmpty(item.optString("material_lib_type")))
goods.setMaterialLibType(item.optInt("material_lib_type"));
+ else
+ goods.setMaterialLibType(0);
return goods;
}
--
Gitblit v1.8.0