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

admin

2020-03-20 c3a5e164cbabbfc5f66e1356cb0de657ce3f58b9

 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(","));

         }