From dfd5fa709c40c0b55613dfd4068afd6ba9d322cd Mon Sep 17 00:00:00 2001
From: zhujunjieit <zhujunjie>
Date: Wed, 9 Jan 2019 23:13:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../train/course/controller/ApiTrainCourseController.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java b/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java
index 8414d41db..ecde2cfa3 100644
--- a/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java
+++ b/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java
@@ -42,7 +42,6 @@ public class ApiTrainCourseController extends BaseController {
 	 * 查询课程列表
 	 */
 	@GetMapping("/trainCourse/list")
-	@ResponseBody
 	public AjaxResult list(TrainCourse trainCourse) {
 		List<TrainCourse> list = trainCourseService.selectTrainCoursePage( trainCourse );
 		AjaxResult success = success( "查询成功" );
@@ -58,7 +57,8 @@ public class ApiTrainCourseController extends BaseController {
 		TrainCourse trainCourse = trainCourseService.selectById( id );
 		TrainCourseCategory courseCategory = trainCourseCategoryService.selectCategoryById( (long) trainCourse.getTrainCourseCategoryId() );
 		JSONObject jsonObject = JSONObject.fromObject( trainCourse );
-		jsonObject.put( "courseCategory", courseCategory );
+		JSONObject courseCategoryJSON = JSONObject.fromObject( courseCategory );
+		jsonObject.put( "courseCategory", courseCategoryJSON );
 		AjaxResult success = success( "查询成功" );
 		success.put( "data", jsonObject );
 		return success;