--no commit message

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

@@ -29,7 +29,7 @@ public class SaveUpdateEbookMainBodyForm {
 	@ApiModelProperty("创刊年份")
 	private String  inauguralYear;
 	@ApiModelProperty("出版日期")
-	private Date  publishTime;
+	private String  publishTime;
 	@ApiModelProperty("国内发行")
 	private String  domesticIssues;
 	@ApiModelProperty("国外发行")

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/fg/ebook/FgQueryEbookInfoForm.java

 package com.zrqx.core.form.resource.fg.ebook;
 
-import java.util.List;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 @Data
 @ApiModel(value="FgQueryEbookInfoForm",description="电子书查询")
 public class FgQueryEbookInfoForm {
-	@ApiModelProperty("作者id")
-	private String authorId;
-	@ApiModelProperty(value = "自定义分类code")
-	private List<String> diyTypeCode;
-	@ApiModelProperty(value = "标签内容code")
-	private List<String> labelContentDiyTypeCode;
-	@ApiModelProperty("民族 1蒙古族 2侗族 3藏族 4朝鲜族 5土家族 6回族 7满族 8汉族")
-	private Integer nationsType;
+	@ApiModelProperty("年份")
+	private String year;
+	@ApiModelProperty("杂志主体")
+	private String diyTypeCode;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/sysuser/bg/hotsw/QueryHotSearchWordForm.java

@@ -8,8 +8,4 @@ import lombok.Data;
 public class QueryHotSearchWordForm{
 	@ApiModelProperty(value = "热搜词")
 	private String hotSearchWord;
-	@ApiModelProperty(value = "审核状态：0未审核,1已审核")
-	private Integer auditStatus;
-	@ApiModelProperty(value = "上架状态：0下架,1上架")
-	private Integer showState;
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/fg/ebook/FgEbookListVO.java

@@ -2,67 +2,18 @@ package com.zrqx.core.vo.resource.fg.ebook;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-
 import lombok.Data;
 @Data
 @ApiModel(value="FgEbookListVO",description="查询电子书集合返回的实体")
 public class FgEbookListVO {
-	//封面、图书名称、评分、评论人数、阅读人数、作者、译者、ISBN、出版社、出版时间、版本、字数、价格（展示定价和售价，如果资源有参与打折活动需显示折扣值）；
 	@ApiModelProperty("id")
 	private String id;
-	@ApiModelProperty(value = "电子书名")
+	@ApiModelProperty(value = "杂志名称")
 	private String name;
-	@ApiModelProperty("作者id")
-	private String authorId;
-	@ApiModelProperty("作者")
-	private String author;
-	@ApiModelProperty("译者id")
-	private String translatorId;
-	@ApiModelProperty("译者")
-	private String translator;
-	@ApiModelProperty("出版时间")
-	private String publishTime;
-	@ApiModelProperty("销售状态 0 不可售 1 可售")
-	private Integer status;
-	@ApiModelProperty("资源类型   1图书、2医家、3文章、4图片、5视频、6音频、7附件")
-	private Integer resourceType;
-	
-	
 	@ApiModelProperty("封面")
 	private String bookCover;
-	@ApiModelProperty("内容简介")
-	private String summary;
-	@ApiModelProperty("电子书状态  0：录入中  1：待审核  2：审核中 3：审核不通过  4：已上架  5：已下架")
-	private String bookStatus;
-	@ApiModelProperty("定价 元")
-	private BigDecimal price;
-	@ApiModelProperty("售价选项 0 免费，1收费")
-	private Integer priceOption;
-	@ApiModelProperty("售价 元")
-	private BigDecimal realPrice;
-	@ApiModelProperty("售价 元")
-	private String realPrice_string;
-	@ApiModelProperty("浏览数量")
-	private Integer browseNum;
-	@ApiModelProperty("商品类型，默认2-1")
-	private String goodsType;
-	
-	@ApiModelProperty("折扣")
-	private BigDecimal discount;
-	@ApiModelProperty("0:未购买；1：已购买")
-	private Integer isBuy;
-	@ApiModelProperty("0:未登录；1：已登录")
-	private Integer isLogin;
-	@ApiModelProperty("0:付费；1：免费")
-	private Integer isFree;
-	@ApiModelProperty("0:不是作者；1：是作者")
-	private Integer isAuthor;
-	@ApiModelProperty("0:阅读；1：加入购车；2：加入购物车(按钮置灰)")
-	private Integer isStatus;
-	@ApiModelProperty("提示消息code")
-	private Integer messageCode;
-	@ApiModelProperty("提示消息")
-	private String message;
+	@ApiModelProperty(value = "年份")
+	private String year;
+	@ApiModelProperty("期数")
+	private String periods;
 }