--no commit message

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

@@ -32,7 +32,6 @@ import com.zrqx.core.form.file.CreatreQRCodeForm;
 import com.zrqx.core.form.resource.bg.ebook.QueryEbookInfoForm;
 import com.zrqx.core.form.resource.bg.ebook.SaveUpdateEbookForm;
 import com.zrqx.core.form.resource.bg.ebook.UpdateEbookForm;
-import com.zrqx.core.model.recommend.RecommendResource;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibraryDiyType;
 import com.zrqx.core.model.resource.articlelibrary.ChapterLibrary;
@@ -72,7 +71,6 @@ import com.zrqx.resource.bg.service.year.YearLibraryService;
 import com.zrqx.resource.commons.Redis;
 
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import tk.mybatis.mapper.entity.Example;
 

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/articlelibrary/ArticleLibraryMapper.java

@@ -25,7 +25,7 @@ public interface ArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 * @return
 	 */
 	@Select("<script>" 
-			+ "select distinct a.id,a.name,a.goodsType,a.author,a.source,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.status "
+			+ "select distinct a.id,a.name,a.goodsType,a.author,a.source,DATE_FORMAT(a.uploadTime,'%Y-%m-%d') uploadTime,a.status,a.bookName "
 			+ "from res_Article_Library a inner join res_Article_Library_Diy_Type ad "
 			+ "on a.id = ad.alid "
 			+ "where 1=1 "