--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/pdffilelibrary/QueryPdfLibraryForm.java

@@ -10,12 +10,6 @@ import lombok.Data;
 public class QueryPdfLibraryForm {
 	@ApiModelProperty(value = "pdf名称")
 	private String name;
-	@ApiModelProperty("作者")
-	private String author;
-	@ApiModelProperty("来源")
-	private String source;
-	@ApiModelProperty("状态：0待审核，1已上架，2已下架")
-	private String status;
 	@ApiModelProperty(value="上传时间-开始")
 	private String beginTime;
 	@ApiModelProperty(value="上传时间-结束")
@@ -24,6 +18,4 @@ public class QueryPdfLibraryForm {
 	private List<Integer> diyTypeId;
 	@ApiModelProperty("自定义分类code")
 	private String diyTypeCode;
-	@ApiModelProperty("民族 1蒙古族 2侗族 3藏族 4朝鲜族 5土家族 6回族 7满族 8汉族")
-	private Integer nationsType;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/pdffilelibrary/SaveUpdatePdfLibraryForm.java

 package com.zrqx.core.form.resource.bg.pdffilelibrary;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
 import java.util.List;
 
-import lombok.Data;
-
 import com.zrqx.core.model.resource.pdffilelibrary.PdfLibraryDiyType;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 @Data
 @ApiModel(value="SaveUpdatePdfLibraryForm",description="添加或修改pdf库")
 public class SaveUpdatePdfLibraryForm {
@@ -22,16 +20,10 @@ public class SaveUpdatePdfLibraryForm {
 	private String source;
 	@ApiModelProperty("关键词")
 	private String keywords;
-	@ApiModelProperty("定价")
-	private BigDecimal price;
-	@ApiModelProperty("简介")
-	private String synopsis;
 	@ApiModelProperty("pdf")
 	private String pdf;
 	@ApiModelProperty(value = "分类id")
 	private List<PdfLibraryDiyType> diyType;
-	@ApiModelProperty("民族 1蒙古族 2侗族 3藏族 4朝鲜族 5土家族 6回族 7满族 8汉族")
-	private Integer nationsType;
 	@ApiModelProperty("pdf名称")
 	private String pdfName;
 }

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/pdffilelibrary/PdfLibraryDiyType.java

 package com.zrqx.core.model.resource.pdffilelibrary;
 
 import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
@@ -13,11 +14,11 @@ import lombok.Data;
 @Table(name = "res_Pdf_Library_Diy_Type")
 public class PdfLibraryDiyType {
 	@Id
-	@GeneratedValue(generator="JDBC")
-	@ApiModelProperty("PDF与自定义分类关系表id")
-	private Integer id;
+	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
+	@ApiModelProperty("文章id，新增时不需要填写")
+	private String id;
 	@ApiModelProperty("PDF库id")
-	private Integer plId;
+	private String plId;
 	@ApiModelProperty("自定义分类id")
 	private Integer dtId;
 	@ApiModelProperty("自定义分类code")

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/pdffilelibrary/PdfLibraryListVO.java

@@ -12,14 +12,6 @@ public class PdfLibraryListVO {
 	private String name;
 	@ApiModelProperty(value = "作者")
 	private String author;
-	@ApiModelProperty("来源")
-	private String source;
-	@ApiModelProperty(value = "pdf")
-	private String pdf;
-	@ApiModelProperty("定价")
-	private String price;
 	@ApiModelProperty("上传时间")
 	private String uploadTime;
-	@ApiModelProperty("状态：0待审核，1已上架，2已下架")
-	private String status;
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/pdffilelibrary/PdfLibraryOneVO.java

@@ -20,10 +20,6 @@ public class PdfLibraryOneVO {
 	private String source;
 	@ApiModelProperty("关键词")
 	private String keywords;
-	@ApiModelProperty("定价")
-	private String price;
-	@ApiModelProperty("简介")
-	private String synopsis;
 	@ApiModelProperty("pdf")
 	private String pdf;
 	@ApiModelProperty(value = "分类id")