From b907ba5b12a98e31d56c8847769875906a682b98 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 16:49:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java
index 1ebcc8a..c88a50c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java
@@ -370,7 +370,7 @@
 	  } else {
 		  JSONObject json = JSONObject.fromObject(versions);
 			
-			String versionsIOS = json.getString("IOS");
+			String versionsIOS = json.optString("IOS");
 			if (versionsIOS != null && versionsIOS.trim().length() > 0) {
 				listIOS = Arrays.asList(versionsIOS.split(","));
 			}

--
Gitblit v1.8.0