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

yujian

2020-05-06 a4637ae9d71aa4a624b217ed3a1483f0e3a3a7ed

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

@@ -204,7 +204,10 @@
               goods.setPrice(item.optString("item_price"));

               goods.setTitle(item.optString("item_title"));

               goods.setTradeId(item.optString("trade_id"));

					
               if (goods.getImg() != null && !goods.getImg().startsWith("http")) {

                  goods.setImg("http:" + goods.getImg());

               }



               taoBaoOrder.setGoods(goods);

               orderList.add(taoBaoOrder);

            } catch (Exception e) {