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

admin

2019-09-24 3f042f2d3ce9bae01678c8e57425f71d774eaad5

 fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java

@@ -132,6 +132,7 @@


      JSONObject resultJson = JSONObject.fromObject(result);

      result = resultJson.optJSONObject("jd_union_open_promotion_common_get_response").optString("result");

      System.out.println(result);

      if (result == null) {

         return null;

      }