Merge remote-tracking branch 'origin/master'

admin

2019-03-25 f8cda1190cbe07208dddc9365a06b0871e83e126

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

@@ -1717,6 +1717,12 @@
            goods.setPictUrl(picture.startsWith("http") ? picture : "https:" + picture);

         }

         goods.setSellerId(seller.optLong("shopId"));

         String shopType = seller.optString("shopType");

         if ("B".equalsIgnoreCase(shopType)) {

            goods.setUserType(1);

         } else

            goods.setUserType(0);



         goods.setShopTitle(seller.optString("shopName"));

         return goods;

      }