From 0a16588d3a08fd389dcf3d3606b0ecf8a3da5609 Mon Sep 17 00:00:00 2001
From: huangwenjun <787558290@qq.com>
Date: Tue, 22 Oct 2019 11:45:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20jobGroup=20list=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../job/admin/controller/JobGroupController.java   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java
index bb130f65..1b0e98c4 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java
@@ -14,10 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 /**
  * job group controller
@@ -44,6 +41,15 @@ public class JobGroupController {
 		return "jobgroup/jobgroup.index";
 	}
 
+	@RequestMapping("/pageList")
+	@ResponseBody
+	public Map<String, Object> pageList() {
+		Map<String, Object> maps = new HashMap<String, Object>();
+		List<XxlJobGroup> list = xxlJobGroupDao.findAll();
+		maps.put("data", list);
+		return maps;
+	}
+
 	@RequestMapping("/save")
 	@ResponseBody
 	public ReturnT<String> save(XxlJobGroup xxlJobGroup){

From 40183b3bbf9fa6f27f11305caf697ce032b20dfd Mon Sep 17 00:00:00 2001
From: huangwenjun <787558290@qq.com>
Date: Tue, 22 Oct 2019 14:50:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=8C=96=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xxl/job/admin/controller/JobGroupController.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java
index 1b0e98c4..58e6a5f1 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java
@@ -43,11 +43,11 @@ public class JobGroupController {
 
 	@RequestMapping("/pageList")
 	@ResponseBody
-	public Map<String, Object> pageList() {
+	public ReturnT pageList() {
 		Map<String, Object> maps = new HashMap<String, Object>();
 		List<XxlJobGroup> list = xxlJobGroupDao.findAll();
 		maps.put("data", list);
-		return maps;
+		return new ReturnT<Object>(maps);
 	}
 
 	@RequestMapping("/save")