update

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/SubjectController.java

@@ -17,6 +17,8 @@ import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.queryInfo.SubjectQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.SubjectService;
 import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
 
 @RequestMapping("subject")
 @Api(tags = "科目服务")
@@ -37,21 +39,21 @@ public class SubjectController extends BaseController {
 	@ApiOperation(value = "根据科目编号查询科目")
 	@GetMapping("/get/{id}")
 	@PreAuthorize("@pcs.hasPermissions('subject/get')")
-	public Object get(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Long id) {
+	public HttpResponseResult<Subject> get(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Long id) {
 		return succeed(subjectService.get(id));
 	}
 
 	@ApiOperation(value = "分页查询科目列表")
 	@GetMapping("/queryPage")
 	@PreAuthorize("@pcs.hasPermissions('subject/queryPage')")
-	public Object queryPage(SubjectQueryInfo queryInfo) {
+	public HttpResponseResult<PageInfo<Subject>> queryPage(SubjectQueryInfo queryInfo) {
 		return succeed(subjectService.queryPage(queryInfo));
 	}
 
 	@ApiOperation(value = "分页查询科目树状列表")
 	@GetMapping("/queryPageTree")
 	@PreAuthorize("@pcs.hasPermissions('subject/queryPageTree')")
-	public Object queryPageTree(SubjectQueryInfo queryInfo) {
+	public HttpResponseResult<PageInfo<Subject>> queryPageTree(SubjectQueryInfo queryInfo) {
 		return succeed(subjectService.queryPageTree(queryInfo));
 	}
 }