--no commit message

app/resource/src/main/java/com/zrqx/resource/commons/vo/fg/membercollection/FgBookShelfVo.java

@@ -26,5 +26,5 @@ public class FgBookShelfVo {
 	@ApiModelProperty("阅读进度")
 	private Integer readingProgress;
 	@ApiModelProperty("文章id")
-	private String newAriticleId;
+	private Integer orderNum;
 }

app/resource/src/main/java/com/zrqx/resource/fg/service/membercollection/FgBookShelfServiceImpl.java

@@ -82,7 +82,7 @@ public class FgBookShelfServiceImpl extends BaseServiceImpl<BookShelf, Integer>
 			if(maxOrderNum != null) {
 				ReadingRecord readingRecord = readingRecordService.selectNewArticleId(f.getResourceId());
 				if(readingRecord != null) {
-					f.setNewAriticleId(readingRecord.getArticleId());
+					f.setOrderNum(readingRecord.getOrderNum());
 					readingProgress =  readingRecord.getOrderNum()*100/maxOrderNum;
 				}
 			}