Merge remote-tracking branch 'origin/div' into div

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java

@@ -208,6 +208,9 @@
      } else

         goods.setMaterialLibType(0);



      goods.setRootCategoryName(item.optString("cat_name"));

      goods.setLeafName(item.optString("cat_leaf_name"));



      goods = loadYuShouInfo(goods, item);

      return goods;

   }