'commit'

dsGw/src/main/java/com/dsideal/gw/Bean/RetBean.java

@@ -17,7 +17,7 @@ public class RetBean {
      */
     private int code;
     private String msg;
-    private JSONArray data;
+    private Object data;
 
     public static final Integer SUCCESS = 200;
     public static final Integer ERROR = 500;
@@ -28,12 +28,11 @@ public class RetBean {
         this.code = code;
         this.msg = msg;
 
-        if (data.get("data") != null) {
+        if (data.getJSONArray("data") != null) {
             this.data = data.getJSONArray("data");
-        } else {
+        } if (data.getJSONObject("data") != null) {
-            this.data = null;
+            this.data = data.getJSONObject("data");
         }
-
     }
 
     public String toJsonString() {