--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/copyright/CopyrightOneVo.java

@@ -24,9 +24,9 @@ public class CopyrightOneVo {
 	@ApiModelProperty("有效期: 0有期限  1无期限")
 	private Integer term;
 	@ApiModelProperty("签订时间")
-	private Date signingTime;
+	private String signingTime;
 	@ApiModelProperty("过期时间")
-	private Date endTime;
+	private String endTime;
 	@ApiModelProperty("甲方")
 	private String firstParty;
 	@ApiModelProperty("乙方")
@@ -42,8 +42,6 @@ public class CopyrightOneVo {
 	@ApiModelProperty("附件")
 	private String attachmentList;
 	
-	@ApiModelProperty("资源id")
-	private List<String> objectId;
-	@ApiModelProperty("资源类型")
-	private List<Integer> type;
+	@ApiModelProperty("资源列表")
+	private List<CopyrightResourceVo> list;
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/copyright/CopyrightResourceVo.java

+package com.zrqx.core.vo.resource.copyright;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+
+@Data
+@ApiModel(value = "CopyrightResourceVo", description = "资源列表Vo")
+public class CopyrightResourceVo {
+
+	@ApiModelProperty("资源id")
+	private String objectId;
+	@ApiModelProperty("资源名")
+	private String name;
+	@ApiModelProperty("资源类型")
+	private Integer type;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("创建时间")
+	private String uploadTime;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/themeLexicon/ImportExcelThemeLexiconVO.java

+package com.zrqx.core.vo.resource.themeLexicon;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+import lombok.Data;
+
+import com.zrqx.core.util.excelutil.ExcelSheetParams;
+
+/** 主题词库导出、导入*/
+@ExcelSheetParams(startRow = 2)
+@Data
+public class ImportExcelThemeLexiconVO {
+	
+	@ApiModelProperty("中文词根")
+	private String chineseRoot;
+	@ApiModelProperty("英文词根")
+	private String englishRoot;
+	@ApiModelProperty("英文缩写")
+	private String abbreviation;
+	@ApiModelProperty("中文同义词")
+	private String chineseSynonym;
+	@ApiModelProperty("英文同义词")
+	private String englishSynonym;
+	@ApiModelProperty("中文释义")
+	private String interpretation;
+	@ApiModelProperty("中文别字")
+	private String faultWord;
+	@ApiModelProperty("词条属性")
+	private String belong;
+	@ApiModelProperty("中文说明")
+	private String chineseExplain;
+	@ApiModelProperty("英文说明")
+	private String englishExplain;
+	@ApiModelProperty("上位词")
+	private String hypernym;
+	@ApiModelProperty("下位词")
+	private String hyponym;
+	@ApiModelProperty("分类编码")
+	private String codes;
+}