Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-20 28cd97d04c68bd8c5fd4adf7780200f61da13654

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

@@ -693,7 +693,7 @@
      }



      String resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);

      // System.out.println("resultStr"+ resultStr);

//       System.out.println("resultStr"+ resultStr);

      JSONObject data = JSONObject.fromObject(resultStr);

      if (data.optJSONObject("tbk_dg_material_optional_response") != null

            && data.optJSONObject("tbk_dg_material_optional_response").optJSONObject("result_list") != null) {