Merge remote-tracking branch 'origin/master'

admin

2018-12-29 117bb1c6a02d99546dd4bf953aeec67b1ab3d94e

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

@@ -193,6 +193,7 @@
         goods.setProvcity(item.optString("provcity"));

         goods.setPictUrl(item.optString("pict_url"));

         goods.setShopTitle(item.optString("nick"));

         goods.setSellerId(item.optLong("seller_id"));



         String optString = item.optString("shop_dsr");

         if (!StringUtil.isNullOrEmpty(optString)) {