--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/system/fg/information/FgInformationForm.java

+package com.zrqx.core.form.system.fg.information;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class FgInformationForm {
+	@ApiModelProperty("栏目标题")
+	private String title;
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/system/fg/information/InformationStutasForm.java

+package com.zrqx.core.form.system.fg.information;
+
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+public class InformationStutasForm {
+	@ApiModelProperty("id")
+	private List<String> ids;
+	@ApiModelProperty("1置顶/0消置顶")
+	private	Integer top;
+}

com.zrqx.core/src/main/java/com/zrqx/core/form/system/fg/information/SaveInformationForm.java

+package com.zrqx.core.form.system.fg.information;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class SaveInformationForm {
+
+	@ApiModelProperty("id,新增时不需要")
+	private String id;
+	@ApiModelProperty("资讯标题")
+	private String title;
+	@ApiModelProperty("资讯栏目id")
+	private String columnId;
+	@ApiModelProperty("来源")
+	private String source;
+	@ApiModelProperty("发布人")
+	private String publishUser;
+	@ApiModelProperty("关联主题id")
+	private String topicId;
+	@ApiModelProperty("关联主题名")
+	private String topic;
+	@ApiModelProperty("内容")
+	private String text;
+	@ApiModelProperty("文件")
+	private String file;
+	@ApiModelProperty("文件名称")
+	private String fileName;
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/system/Information.java

@@ -27,6 +27,8 @@ public class Information {
 	private String title;
 	@ApiModelProperty("资讯栏目id")
 	private String columnId;
+	@ApiModelProperty("资讯栏目")
+	private String column;
 	@ApiModelProperty("来源")
 	private String source;
 	@ApiModelProperty("发布人")
@@ -46,4 +48,5 @@ public class Information {
 	private Integer top;
 	@ApiModelProperty("更新时间")
 	private Date updateTime;
+	
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/system/fg/information/FgInformationVo.java

+package com.zrqx.core.vo.system.fg.information;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class FgInformationVo {
+	@ApiModelProperty("资讯id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty("资讯标题")
+	private String title;
+	@ApiModelProperty("发布时间")
+	@JsonIgnore
+	private Date publishTime;
+	@ApiModelProperty("内容")
+	private String text;
+	@ApiModelProperty("浏览量")
+	private Integer lookNum;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/system/fg/information/InformationColumnListVo.java

+package com.zrqx.core.vo.system.fg.information;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class InformationColumnListVo {
+	@ApiModelProperty("资讯id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty("资讯标题")
+	private String title;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/system/fg/information/InformationListVo.java

+package com.zrqx.core.vo.system.fg.information;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class InformationListVo {
+	@ApiModelProperty("资讯id，新增时不需要填写")
+	private String id;
+	@ApiModelProperty("资讯标题")
+	private String title;
+	@ApiModelProperty("资讯栏目")
+	private String column;
+	@ApiModelProperty("来源")
+	private String source;
+	@ApiModelProperty("发布人")
+	private String publishUser;
+	@ApiModelProperty("发布时间")
+	@JsonIgnore
+	private Date publishTime;
+	@ApiModelProperty("浏览量")
+	private Integer lookNum;
+	@ApiModelProperty("置顶")
+	private Integer top;
+	@ApiModelProperty("资讯栏目（后台使用）")
+	private String columnId;
+}