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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

 utils/src/main/java/org/yeshi/utils/JsonUtil.java

@@ -63,7 +63,10 @@
   }



   public static String loadJSONP(String callback, String data) {

      return callback + "(" + data + ")";

      if (StringUtil.isNullOrEmpty(callback))

         return data;

      else

         return callback + "(" + data + ")";

   }



   public static String loadFalseResult(int code, String error) {