--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/content/bg/content/SaveUpdateContentForm.java

@@ -4,6 +4,10 @@
  */
 package com.zrqx.core.form.content.bg.content;
 
+import java.util.List;
+
+import com.zrqx.core.model.content.content.ContentImg;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -59,15 +63,13 @@ public class SaveUpdateContentForm {
 	@ApiModelProperty("正文")
 	private String text;
 	@ApiModelProperty("图组")
-	private String[] imgs;
-	@ApiModelProperty("简介")
-	private String[] synopsis;
+	private List<ContentImg> list;
 	@ApiModelProperty("视频")
 	private String video;
 	@ApiModelProperty("录入人")
 	private String userName;
 	@ApiModelProperty("录入人id")
-	private Integer userId;
+	private String userId;
 	@ApiModelProperty("所属分类")
 	private String classify;
 	@ApiModelProperty("评论数量")

com.zrqx.core/src/main/java/com/zrqx/core/model/content/content/Content.java

@@ -70,10 +70,6 @@ public class Content {
 	private String cover;
 	@ApiModelProperty("正文")
 	private String text;
-	@ApiModelProperty("图组")
-	private String[] imgs;
-	@ApiModelProperty("简介")
-	private String[] synopsis;
 	@ApiModelProperty("视频")
 	private String video;
 	@ApiModelProperty("上传时间")
@@ -85,7 +81,7 @@ public class Content {
 	@ApiModelProperty("录入人")
 	private String userName;
 	@ApiModelProperty("录入人id")
-	private Integer userId;
+	private String userId;
 	@ApiModelProperty("所属分类")
 	private String classify;
 	@ApiModelProperty("评论数量")

com.zrqx.core/src/main/java/com/zrqx/core/model/content/content/ContentImg.java

+package com.zrqx.core.model.content.content;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import lombok.Data;
+
+@Data
+@ApiModel(value = "ContentImg", description = "内容图组库")
+@Table(name = "con_content_img")
+public class ContentImg {
+
+	@Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("   不需要传")
+	private Integer id;
+	@ApiModelProperty("内容id,不需要传")
+	private Integer contentId;
+	@ApiModelProperty("图片")
+	private String img;
+	@ApiModelProperty("简介")
+	private String synopsis;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/content/content/ContentOntVo.java

+package com.zrqx.core.vo.content.content;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+import lombok.Data;
+
+import com.zrqx.core.model.content.content.ContentImg;
+
+@Data
+@ApiModel(value = "ContentOntVo", description = "查询内容详情的实体")
+public class ContentOntVo {
+	@ApiModelProperty("内容id，新增时不需要填写")
+	private Integer id;
+	@ApiModelProperty("引题")
+	private String cite;
+	@ApiModelProperty("主标题")
+	private String title;
+	@ApiModelProperty("副标题")
+	private String subhead;
+	@ApiModelProperty("属性")
+	private String property;
+	@ApiModelProperty("所属栏目")
+	private String columnName;
+	@ApiModelProperty("所属栏目Id")
+	private Integer columnId;
+	@ApiModelProperty("作者")
+	private String author;
+	@ApiModelProperty("作者id")
+	private Integer authorId;
+	@ApiModelProperty("内容来源名")
+	private String source;
+	@ApiModelProperty("内容来源id")
+	private Integer sourceId;
+	@ApiModelProperty("网址")
+	private String website;
+	@ApiModelProperty("发布时间")
+	private String releaseTime;
+	@ApiModelProperty("下线时间")
+	private String offlineTime;
+	@ApiModelProperty("关键词")
+	private String keywords;
+	@ApiModelProperty("权重")
+	private Integer weight;
+	@ApiModelProperty("实际点击量")
+	private Integer actualClickNum;
+	@ApiModelProperty("虚拟点击量")
+	private Integer fictitiousClickNum;
+	@ApiModelProperty("点击量")
+	private Integer clickNum;
+	@ApiModelProperty("封面")
+	private String cover;
+	@ApiModelProperty("正文")
+	private String text;
+	@ApiModelProperty("图组")
+	private List<ContentImg> list;
+	@ApiModelProperty("视频")
+	private String video;
+	@ApiModelProperty("录入人")
+	private String userName;
+	@ApiModelProperty("录入人id")
+	private Integer userId;
+	@ApiModelProperty("所属分类")
+	private String classify;
+	@ApiModelProperty("评论数量")
+	private Integer commentNum;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/content/content/ContentVo.java

@@ -4,12 +4,16 @@
  */
 package com.zrqx.core.vo.content.content;
 
+import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
+import com.zrqx.core.model.content.content.ContentImg;
+
 import lombok.Data;
 
 /**
@@ -39,9 +43,7 @@ public class ContentVo {
 	@ApiModelProperty("正文")
 	private String text;
 	@ApiModelProperty("图组")
-	private String[] imgs;
-	@ApiModelProperty("简介")
-	private String[] synopsis;
+	private List<ContentImg> list;
 	@ApiModelProperty("视频")
 	private String video;
 	@ApiModelProperty("审核状态：0待审核 1审核通过 2审核未通过")