--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/fg/authorLibrary/FgQueryOtherAuthorForm.java

@@ -7,9 +7,7 @@ import lombok.Data;
 @Data
 @ApiModel(value="FgQueryOtherAuthorForm",description="相关名医")
 public class FgQueryOtherAuthorForm {
-	@ApiModelProperty(value = "作者id", required = true)
-	private Integer id;
-	@ApiModelProperty(value = "展示数量", required = true)
+	@ApiModelProperty(value = "展示数量")
 	private Integer num;
 	@ApiModelProperty(value = "民族 1蒙古族 2侗族 3藏族 4朝鲜族 5土家族 6回族 7满族 8汉族", required = true)
 	private Integer nationsType;

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/fg/articlelibrary/FgArticleLibraryOneVO.java

@@ -72,8 +72,6 @@ public class FgArticleLibraryOneVO {
 	private Integer isLogin;
 	@ApiModelProperty("0:付费；1：免费")
 	private Integer isFree;
-	@ApiModelProperty("0:不是机构会员；1：是机构会员")
-	private Integer isOrganMember;
 	@ApiModelProperty("0:不是作者；1：是作者")
 	private Integer isAuthor;
 	@ApiModelProperty("提示消息")

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

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
 
 
 
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -86,14 +87,14 @@ public class FgEbookVO {
 	
 	@ApiModelProperty("折扣")
 	private BigDecimal discount;
+	@ApiModelProperty("0：未收藏；1：已收藏")
+	private Integer isCollection;
 	@ApiModelProperty("0:未购买；1：已购买")
 	private Integer isBuy;
 	@ApiModelProperty("0:未登录；1：已登录")
 	private Integer isLogin;
 	@ApiModelProperty("0:付费；1：免费")
 	private Integer isFree;
-	@ApiModelProperty("0:不是机构会员；1：是机构会员")
-	private Integer isOrganMember;
 	@ApiModelProperty("0:不是作者；1：是作者")
 	private Integer isAuthor;
 	@ApiModelProperty("提示消息")