--no commit message

app/resource/src/main/java/com/zrqx/resource/bg/controller/ebook/EbookController.java

@@ -1196,10 +1196,10 @@ public class EbookController {
 	public List<ChapterLibrary> tree(List<ChapterLibrary> list,List<ChapterLibrary> voList){
 		voList.forEach(entity ->{
 			//第一次设置 一级分类的子类  后续递归设置 子类的子类
-			entity.setList(Copy.copyList(list, ChapterLibrary.class,obj -> obj.getParentId().equals(entity.getMarkId())));
+			entity.setChapterList(Copy.copyList(list, ChapterLibrary.class,obj -> obj.getParentId().equals(entity.getMarkId())));
 			//当前分类存在子类 开始递归子类
-			if(entity.getList().size() > 0){
-				tree(list, entity.getList());
+			if(entity.getChapterList().size() > 0){
+				tree(list, entity.getChapterList());
 			}
 		});
 		return voList;

app/resource/src/main/java/com/zrqx/resource/commons/model/articlelibrary/ChapterLibrary.java

@@ -54,7 +54,7 @@ public class ChapterLibrary implements java.io.Serializable {
 	
 	@Transient
 	@ApiModelProperty(value = "子目录")
-	private List<ChapterLibrary> list = new ArrayList<ChapterLibrary>();
+	private List<ChapterLibrary> chapterList = new ArrayList<ChapterLibrary>();
 	
 	@Transient
 	@ApiModelProperty(value = "绑定资源状态")

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

@@ -474,10 +474,10 @@ public class FgEbookController {
 	public List<ChapterLibrary> tree(List<ChapterLibrary> list,List<ChapterLibrary> voList){
 		voList.forEach(entity ->{
 			//第一次设置 一级分类的子类  后续递归设置 子类的子类
-			entity.setList(Copy.copyList(list, ChapterLibrary.class,obj -> obj.getParentId().equals(entity.getMarkId())));
+			entity.setChapterList(Copy.copyList(list, ChapterLibrary.class,obj -> obj.getParentId().equals(entity.getMarkId())));
 			//当前分类存在子类 开始递归子类
-			if(entity.getList().size() > 0){
-				tree(list, entity.getList());
+			if(entity.getChapterList().size() > 0){
+				tree(list, entity.getChapterList());
 			}
 		});
 		return voList;