--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/constant/member/MemberRequestPath.java

@@ -19,7 +19,8 @@ public class MemberRequestPath extends BaseRequestPath {
 	public static final String ORGAN = "/organ";
 	/** 站内信 **/
 	public static final String PM = "/pm";
-	
+	/** vip会员 **/
+	public static final String VIP = "/vip";
 	//前台模块
 	/** 登录与注册*/
 	public static final String PERMISSIONS 	= "/permissions";

com.zrqx.core/src/main/java/com/zrqx/core/constant/resource/ResourceRequestPath.java

@@ -34,6 +34,8 @@ public class ResourceRequestPath extends BaseRequestPath {
 	public static final String DIYTYPE = "/diytype";
 	/** 推荐位 **/
 	public static final String RECOMMEND = "/recommend";
+	/** 国别税制 **/
+	public static final String COUNTRY = "/country";
 	/** 批量删除推荐组资源 */
 	public static final String RES_SAVE = "/res" + SAVE ;
 	/** 批量删除推荐组资源 */

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/fg/articlelibrary/FgQueryArticleLibraryForm.java

 package com.zrqx.core.form.resource.fg.articlelibrary;
 
-import java.util.List;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,14 +8,12 @@ import lombok.Data;
 @ApiModel(value="FgQueryArticleLibraryForm",description="文章库")
 public class FgQueryArticleLibraryForm {
 
-	@ApiModelProperty("作者id")
-	private String authorId;
-	@ApiModelProperty(value = "自定义分类id")
-	private List<Integer> diyTypeId;
-	@ApiModelProperty(value = "标签内容id")
-	private List<Integer> labelContentDiyTypeId;
-	@ApiModelProperty("民族 1蒙古族 2侗族 3藏族 4朝鲜族 5土家族 6回族 7满族 8汉族")
-	private Integer nationsType;
-	@ApiModelProperty("文章类型 1理论 2药物 3方剂 4临床 5医案 6文化 7机构 8医论 9其他 10未分类 11蒙文")
-	private Integer resourceType;
+	@ApiModelProperty(value = "自定义分类编号")
+	private String code;
+	@ApiModelProperty(value = "关键词")
+	private String keyword;
+	@ApiModelProperty(value = "结果中搜索关键词")
+	private String subKeyword;
+	
+	
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/fg/resource/FgSearchForm.java

@@ -10,14 +10,10 @@ import lombok.Data;
 @Data
 @ApiModel(value="FgSearchForm",description="检索")
 public class FgSearchForm {
-	@ApiModelProperty(value = "内容")
+	@ApiModelProperty(value = "关键字")
 	private String content;
-	@ApiModelProperty("民族 1蒙古族 2侗族 3藏族 4朝鲜族 5土家族 6回族 7满族 8汉族")
-	private Integer nationsType;
-	@ApiModelProperty(value = "资源类型 31理论 32药物 33方剂34临床 35医案 36文化 37机构 38医论 48其他 1医著 2医家", required = true)
-	private Integer resourceType;
 	@ApiModelProperty(value = "自定义分类code")
 	private List<String> diyTypeCode;
-	@ApiModelProperty(value = "标签内容code")
-	private List<String> labelContentDiyTypeCode;
+	@ApiModelProperty(value = "结果中检索关键字")
+	private String subcontent;
 }

com.zrqx.core/src/main/java/com/zrqx/core/model/member/PersonalMember.java

 package com.zrqx.core.model.member;
 
+import java.util.Date;
+
 import javax.persistence.Id;
 import javax.persistence.Table;
 
@@ -28,5 +30,9 @@ public class PersonalMember {
 	private Integer sex;
 	@ApiModelProperty("头像地址")
 	private String img;
+	@ApiModelProperty("vip会员  0否 1是 2已过期")
+	private Integer vip;
+	@ApiModelProperty("vip会员结束日期")
+	private Date endTime;
 
 }

com.zrqx.core/src/main/java/com/zrqx/core/model/member/Vip.java

+package com.zrqx.core.model.member;
+
+import java.math.BigDecimal;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@Table(name = "m_vip")
+@ApiModel(value = "Vip", description = "vip用户")
+public class Vip {
+	@Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty(value = "ID")
+	private Integer id;
+	@ApiModelProperty(value = "会员类型", required = true)
+	private String name;
+	@ApiModelProperty(value = "有效期", required = true)
+	private Integer time;
+	@ApiModelProperty(value = "排序号", required = true)
+	private Integer orderNum;
+	@ApiModelProperty(value = "简介")
+	private String intro;
+	@ApiModelProperty(value = "定价")
+	private BigDecimal price;
+	@ApiModelProperty(value = "售价", required = true)
+	private BigDecimal sellprice;
+	@ApiModelProperty(value = "会员状态 1弃用 0禁用", required = true)
+	private Integer status;
+
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/countrytaxsystem/CountryTaxSystem.java

+package com.zrqx.core.model.resource.countrytaxsystem;
+
+import java.util.Date;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "CountryTaxSystem", description = "国别税制")
+@Table(name = "res_country_tax_system")
+public class CountryTaxSystem {
+	@Id
+	@ApiModelProperty("id 修改时不用填")
+	@GeneratedValue(strategy =GenerationType.IDENTITY, generator = "SELECT REPLACE (UUID(), '-', '')")
+	private String id;
+	@ApiModelProperty(value = "名称", required = true)
+	private String name;
+	@ApiModelProperty(value = "封面", required = true)
+	private String cover;
+	@ApiModelProperty(value = "简介", required = true)
+	private String intro;
+	@ApiModelProperty(value = "排序号", required = true)
+	private Integer orderNum;
+	@JsonIgnore
+	@ApiModelProperty(value = "录入日期")
+	private Date uploadTime;
+	@JsonIgnore
+	@ApiModelProperty(value = "修改日期")
+	private Date updateTime;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/member/fg/personalcenter/MemberInfo.java

@@ -39,4 +39,6 @@ public class MemberInfo {
 	private String beginTime;
 	@ApiModelProperty("到期时间")
 	private String endTime;
+	@ApiModelProperty("vip会员  0否 1是 2已过期")
+	private Integer vip;
 }