Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

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

@@ -395,7 +395,7 @@
      Object pinGouInfo = json.get("pinGouInfo");

      if (pinGouInfo != null) {

         JSONObject pinGouInfoJson = JSONObject.fromObject(pinGouInfo);

         if (!pinGouInfoJson.isNullObject()) {

         if (!pinGouInfoJson.isEmpty()) {

            JDPingouInfo jdPinGouInfo = new JDPingouInfo();

            jdPinGouInfo.setPingouPrice(new BigDecimal(pinGouInfoJson.optString("pingouPrice")));

            jdPinGouInfo.setPingouTmCount(pinGouInfoJson.optLong("pingouTmCount"));