--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/articlelibrary/QueryArticleLibraryForm.java

 package com.zrqx.core.form.resource.bg.articlelibrary;
 
-import java.util.List;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,20 +8,6 @@ import lombok.Data;
 public class QueryArticleLibraryForm {
 	@ApiModelProperty(value = "文章标题、作者、所属杂志")
 	private String name;
-	@ApiModelProperty(value = "作者")
-	private String author;
-	@ApiModelProperty(value = "所属杂志")
-	private String source;
 	@ApiModelProperty("状态：0已下架，1已上架")
 	private String status;
-	@ApiModelProperty(value="上传时间-开始")
-	private String beginTime;
-	@ApiModelProperty(value="上传时间-结束")
-	private String endTime;
-	@ApiModelProperty(value = "自定义分类id")
-	private List<Integer> diyTypeId;
-	@ApiModelProperty("自定义分类code")
-	private String diyTypeCode;
-	@ApiModelProperty("录入方式：1：手动录入 2:EPUB导入")
-	private String goodsType;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/articlelibrary/SaveUpdateArticleLibraryForm.java

 package com.zrqx.core.form.resource.bg.articlelibrary;
 
-import java.math.BigDecimal;
-import java.util.List;
-
-import com.zrqx.core.model.resource.articlelibrary.ArticleLibraryDiyType;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,16 +16,10 @@ public class SaveUpdateArticleLibraryForm {
 	private String source;
 	@ApiModelProperty("关键词")
 	private String keywords;
-	@ApiModelProperty("简介")
-	private String synopsis;
 	@ApiModelProperty("正文")
 	private String text;
-	@ApiModelProperty("pdf")
-	private String pdf;
 	@ApiModelProperty("封面")
 	private String img;
-	@ApiModelProperty(value = "分类id")
-	private List<ArticleLibraryDiyType> diyType;
-	@ApiModelProperty("pdf名称")
-	private String pdfName;
+	@ApiModelProperty("排序")
+	private Integer sort;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/audiolibrary/SaveUpdateAudioLibraryForm.java

 package com.zrqx.core.form.resource.bg.audiolibrary;
 
-import java.math.BigDecimal;
-import java.util.List;
-
-import com.zrqx.core.model.resource.audiolibrary.AudioLibraryDiyType;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,12 +8,6 @@ import lombok.Data;
 public class SaveUpdateAudioLibraryForm {
 	@ApiModelProperty("音频id，新增时不需要填写")
 	private String id;
-	@ApiModelProperty(value = "音频名称")
-	private String name;
-	@ApiModelProperty("来源")
-	private String source;
-	@ApiModelProperty("关键词")
-	private String keywords;
 	@ApiModelProperty("封面")
 	private String cover;
 	@ApiModelProperty("时长")
@@ -31,6 +20,4 @@ public class SaveUpdateAudioLibraryForm {
 	private String audio;
 	@ApiModelProperty("格式")
 	private String formats;
-	@ApiModelProperty(value = "分类id")
-	private List<AudioLibraryDiyType> diyType;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/ebook/UpdateEbookRelationForm.java

@@ -13,6 +13,4 @@ public class UpdateEbookRelationForm {
 	/**排序号**/
 	@ApiModelProperty("排序号")
 	private Integer sort;
-	@ApiModelProperty("资源类型")
-	private Integer resourceType;
 }

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/articlelibrary/ArticleLibrary.java

@@ -75,4 +75,6 @@ public class ArticleLibrary {
 	private String pdfName;
 	@ApiModelProperty("售价选项 0 免费，1收费")
 	private Integer priceOption;
+	@ApiModelProperty("排序")
+	private Integer sort;
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/articlelibrary/ArticleLibraryListVO.java

@@ -12,13 +12,13 @@ public class ArticleLibraryListVO {
 	private String name;
 	@ApiModelProperty("作者")
 	private String author;
-	@ApiModelProperty("所属杂志")
+	@ApiModelProperty("来源")
 	private String source;
 	@ApiModelProperty("上传时间")
 	private String uploadTime;
 	@ApiModelProperty("状态：0已下架，1已上架")
 	private String status;
-	@ApiModelProperty("录入方式：1：手动录入 2:EPUB导入")
-	private String goodsType;
+	@ApiModelProperty("排序")
+	private Integer sort;
 	
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/articlelibrary/ArticleLibraryOneVO.java

 package com.zrqx.core.vo.resource.articlelibrary;
 
-import java.util.List;
-
-import com.zrqx.core.model.resource.articlelibrary.ArticleLibraryDiyType;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,44 +10,16 @@ public class ArticleLibraryOneVO {
 	private String id;
 	@ApiModelProperty(value = "文章标题")
 	private String name;
-	@ApiModelProperty("作者id")
-	private String authorId;
 	@ApiModelProperty("作者")
 	private String author;
 	@ApiModelProperty("来源")
 	private String source;
 	@ApiModelProperty("关键词")
 	private String keywords;
-	@ApiModelProperty("定价")
-	private String price;
-	@ApiModelProperty("简介")
-	private String synopsis;
 	@ApiModelProperty("正文")
 	private String text;
-	@ApiModelProperty("pdf")
-	private String pdf;
 	@ApiModelProperty("封面")
 	private String img;
-	@ApiModelProperty("音频文件")
-	private String audio;
-	@ApiModelProperty("售价")
-	private String realPrice;
-	@ApiModelProperty("全文阅读权限 0 游客可见 1会员可见")
-	private Integer readTextPower;
-	@ApiModelProperty("文章类型 1理论 2药物 3方剂 4临床 5医案 6文化 7机构 8其他 9未分类 10蒙文")
-	private Integer resourceType;
-	@ApiModelProperty(value = "预览文章")
-	private String previewText;
-	
-	@ApiModelProperty(value = "分类id")
-	private List<ArticleLibraryDiyType> diyType;
-	
-	@ApiModelProperty("pdf名称")
-	private String pdfName;
-	@ApiModelProperty("售价选项 0 免费，1收费")
-	private Integer priceOption;
-	@ApiModelProperty(value = "作者名称和id（用,隔开）")
-	private String authorNameAndId;
-	@ApiModelProperty(value = "标签内容id")
-	private List<Integer> labelContentDiyTypeIds;
+	@ApiModelProperty("排序")
+	private Integer sort;
 }