--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/authorlibrary/AuthorLibraryOneVO.java

@@ -45,6 +45,8 @@ public class AuthorLibraryOneVO {
 	private List<String> labelId;
 	@ApiModelProperty(value = "标签内容id")
 	private List<String> labelContentId;
+	@ApiModelProperty(value = "标签内容code")
+	private List<String> labelContentCode;
 	@ApiModelProperty(value = "标签内容")
 	private List<LabelAndContentByDataTypeVO> labelList;
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/ebook/EbookExcelListVO.java

@@ -11,32 +11,16 @@ public class EbookExcelListVO {
 	private String isbn;
 	@ApiModelProperty(value = "图书名")
 	private String name;
-	@ApiModelProperty("副标题")
-	private String subheading;
-	@ApiModelProperty("版次")
-	private String edition;
-	@ApiModelProperty("印次")
-	private String print;
-	@ApiModelProperty("自定义分类名称")
-	private String code;
-	@ApiModelProperty("定价")
-	private String price;
-	@ApiModelProperty("责任编辑")
-	private String executiveEditor;
 	@ApiModelProperty("作者")
 	private String author;
-	@ApiModelProperty("装帧")
-	private String binding;
-	@ApiModelProperty("字数")
-	private String wordCount;
-	@ApiModelProperty("出版时间")
-	private String publishTime;
+	@ApiModelProperty("责任编辑")
+	private String executiveEditor;
 	@ApiModelProperty("出版单位")
 	private String publisher;
-	@ApiModelProperty("作者介绍")
-	private String authorIntro;
-	@ApiModelProperty("​关键词")
-	private String keywords;
-	@ApiModelProperty("内容简介")
-	private String bookIntro;
+	@ApiModelProperty("出版时间")
+	private String publishTime;
+	@ApiModelProperty("版次")
+	private String edition;
+	@ApiModelProperty("丛书名称")
+	private String series;	
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/ebook/ExcelBookVO.java

@@ -17,32 +17,16 @@ public class ExcelBookVO {
 	private String name;
 	@ExcelResources(title="ISBN（国际标准书号）")
 	private String isbn;
-	@ExcelResources(title="版次")
-	private String edition;
-	/*@ExcelResources(title="中图分类（号）")
-	private String code;*/
-	@ExcelResources(title="自定义分类名称")
-	private String code;
-	@ExcelResources(title="印次")
-	private String print;
-	@ExcelResources(title="内容简介")
-	private String bookIntro;
 	@ExcelResources(title="作者")
 	private String author;
-	@ExcelResources(title="作者介绍")
-	private String authorIntro;
-	@ExcelResources(title="定价")
-	private String price;
-	@ExcelResources(title="装帧")
-	private String binding;
-	@ExcelResources(title="字数")
-	private String wordCount;
-	@ExcelResources(title="副标题")
-	private String subheading;
+	@ExcelResources(title="丛书名称")
+	private String series;	
+	@ExcelResources(title="版次")
+	private String edition;
 	@ExcelResources(title="责任编辑")
 	private String executiveEditor;
 	@ExcelResources(title="出版时间")
 	private String publishTime;
-	@ExcelResources(title="​关键词")
-	private String keywords;
+	@ExcelResources(title="出版单位")
+	private String publisher;
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/works/apply/ApplyResourceVo.java

@@ -7,6 +7,8 @@ package com.zrqx.core.vo.works.apply;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
+
 import lombok.Data;
 
 /**
@@ -35,7 +37,7 @@ public class ApplyResourceVo {
 	@ApiModelProperty("大小")
 	private String size;
 	@ApiModelProperty("创建时间")
-	private String uploadTime;
+	private Date uploadTime;
 	@ApiModelProperty("申请id")
 	private Integer applyId;
 //	@ApiModelProperty("部门id")