--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/ebook/FgEbookController.java

@@ -63,7 +63,7 @@ public class FgEbookController {
 		List<FgEbookListVO> list = ebookservice.page(form, pageParam);
 		return CallBack.success(new PageInfo<FgEbookListVO>(list));
 	}
-	@ApiOperation("查询杂志")
+	@ApiOperation("查询杂志、文章列表")
 	@GetMapping(ResourceRequestPath.PAGE_BOOK)
 	public CallBack<PageInfo<FgArticleLibraryListVO>> getBookOrArticleList(FgQueryArticleLibraryForm form, PageParam pageParam) {
 		if (null != pageParam && StringUtils.isBlank(pageParam.getOrderBy())) {
@@ -96,7 +96,7 @@ public class FgEbookController {
 		// 更新浏览量
 		ebookservice.updateBrowseNum(entity.getId());
 		List<ResourceRelationVo> list = resourceRelationService.FgqueryByIdAndResourceType(entity);
-		vo.setList(resourceRelationService.queryRelationList(list));
+		vo.setListArticle(resourceRelationService.queryRelationList(list));
 		return CallBack.success(vo);
 	}