Merge remote-tracking branch 'origin/master'

admin

2019-01-23 324aea6f8b2d36ea5b6fc1b03d29ad8dfae40259

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

@@ -324,10 +324,11 @@
               goods.setPayRate30(1);



            if (item.optBoolean("free_shipment"))

               goods.setFreeShipment(1);

               goods.setFreeShipment(1);


            if ("1".equalsIgnoreCase(item.optString("material_lib_type")))

               ;


            goodsList.add(goods);

         }

      }