--no commit message

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

@@ -65,7 +65,7 @@ public interface ArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 * @date: 2019年9月20日 上午10:39:57
 	 */
 	@Select("<script>" 
-			+ "select * from res_article_library  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt; date(uploadTime) ORDER BY uploadTime desc "
+			+ "select id,name,DATE_FORMAT(uploadTime,'%Y-%m-%d') uploadTime,browseNum from res_article_library  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt; date(uploadTime) ORDER BY uploadTime desc "
 		    + "</script>")
 	List<ArticleLibrary> queryArticleReadingVolume();
 

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/ebook/BookMapper.java

@@ -24,7 +24,7 @@ public interface BookMapper extends BaseMapper<Book> {
 		    + "</script>")
 	List<ResourceRelationListVo> queryByTileAndDiyType(QueryResourceForPoPForm form);
 	@Select("<script>" 
-			+"select * from res_book  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt; date(uploadTime) ORDER BY uploadTime desc"
+			+"select id,name,DATE_FORMAT(uploadTime,'%Y-%m-%d') uploadTime,browseNum from res_book  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt; date(uploadTime) ORDER BY uploadTime desc"
 		    + "</script>")
 	List<Book> queryBookReadingVolume();