diff --git a/src/main/java/cn/hellohao/controller/AdminRootController.java b/src/main/java/cn/hellohao/controller/AdminRootController.java
index 394298e..00d6582 100644
--- a/src/main/java/cn/hellohao/controller/AdminRootController.java
+++ b/src/main/java/cn/hellohao/controller/AdminRootController.java
@@ -55,6 +55,7 @@ public class AdminRootController {
 
 
     @PostMapping(value = "/getUserList")//new
+    @ResponseBody
     public Map<String, Object> getUserList(@RequestParam(value = "data", defaultValue = "") String data) {
         JSONObject jsonObj = JSONObject.parseObject(data);
         Integer pageNum = jsonObj.getInteger("pageNum");
@@ -81,7 +82,7 @@ public class AdminRootController {
             JSONObject jsonObj = JSONObject.parseObject(data);
             Integer id = jsonObj.getInteger("id");
             String email = jsonObj.getString("email");
-            Integer memory = jsonObj.getInteger("memory");
+            Long memory = jsonObj.getLong("memory");
             Integer groupid = jsonObj.getInteger("groupid");
             Integer isok = jsonObj.getInteger("isok");
             if(memory<0 || memory>1048576L){
@@ -95,7 +96,7 @@ public class AdminRootController {
             User userInfo = userService.getUsers(user2);
             user.setId(id);
             user.setEmail(email);
-            user.setMemory(Integer.toString(memory*1024*1024));
+            user.setMemory(Long.toString(memory*1024*1024));
             user.setGroupid(groupid);
             if(userInfo.getLevel()==1){
                 user.setIsok(isok==1?1:-1);
diff --git a/src/main/java/cn/hellohao/pojo/User.java b/src/main/java/cn/hellohao/pojo/User.java
index 1e873fb..7a036a9 100644
--- a/src/main/java/cn/hellohao/pojo/User.java
+++ b/src/main/java/cn/hellohao/pojo/User.java
@@ -18,13 +18,15 @@ public class User {
     private Integer isok;
     private  String memory;
     private Integer groupid;
+    private String groupname;
 
 
     public User() {
         super();
     }
 
-    public User(Integer id, String username, String password, String email, String birthder, Integer level, String uid, Integer isok, String memory, Integer groupid) {
+    public User(Integer id, String username, String password, String email, String birthder, Integer level, String uid,
+                Integer isok, String memory, Integer groupid,String groupname) {
         this.id = id;
         this.username = username;
         this.password = password;
@@ -35,6 +37,7 @@ public class User {
         this.isok = isok;
         this.memory = memory;
         this.groupid = groupid;
+        this.groupname = groupname;
     }
 
     public Integer getId() {
@@ -116,4 +119,12 @@ public class User {
     public void setGroupid(Integer groupid) {
         this.groupid = groupid;
     }
+
+    public String getGroupname() {
+        return groupname;
+    }
+
+    public void setGroupname(String groupname) {
+        this.groupname = groupname;
+    }
 }