--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/enums/ArticleTypeEnum.java

@@ -17,7 +17,7 @@ public enum ArticleTypeEnum {
 	/** 案例 */
 	ANLI(32, "案例"),
 	/** 实操技能库 */
-	SHICAOJINENGKU(33, "实操技能库"),
+	SHICAOJINENGKU(33, "实操技能"),
 	/** 法规 */
 	FAGUI(34, "法规"),
 	/** 问答 */

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

@@ -10,6 +10,8 @@ import lombok.Data;
 @Data
 @ApiModel(value="FgSearchForm",description="检索")
 public class FgSearchForm {
+	@ApiModelProperty(value = "资源id")
+	private String id;
 	@ApiModelProperty(value = "内容")
 	private String content;
 	@ApiModelProperty(value = "资源类型 0全部1图书 31文章 23案例 33实操技能 34法规 35问答 2微课 ")

com.zrqx.core/src/main/java/com/zrqx/core/form/sysuser/bg/forum/QueryForumForm.java

@@ -16,7 +16,7 @@ public class QueryForumForm {
 	@ApiModelProperty(value = "状态：0下线，1上线")
 	private Integer isOnLine;
 	@ApiModelProperty(value="开始时间")
-	private String biginTime;
+	private String beginTime;
 	@ApiModelProperty(value="结束时间")
 	private String endTime;
 }

com.zrqx.core/src/main/java/com/zrqx/core/form/sysuser/bg/forum/SaveOrUpdateForumForm.java

 package com.zrqx.core.form.sysuser.bg.forum;
 
+import java.util.List;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -21,5 +23,6 @@ public class SaveOrUpdateForumForm {
 	private Integer type;
 	@ApiModelProperty(value = "图片集合")
 	private String imgs;
-	
+	@ApiModelProperty(value = "照片列表")
+	private List<String> imgList;
 }

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

@@ -7,6 +7,8 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 import lombok.Data;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 /**
  * 前台-文章
  * @author ycw
@@ -39,6 +41,7 @@ public class FgArticleLibraryListVO {
 	private BigDecimal price;
 	@ApiModelProperty("售价")
 	private BigDecimal realPrice;
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") //出参
 	@ApiModelProperty("上传时间")
 	private Date uploadTime;
 	@ApiModelProperty("文章封面")
@@ -69,5 +72,6 @@ public class FgArticleLibraryListVO {
 	private Integer isAudio;
 	@ApiModelProperty("是否有视频：0：没有；1：有")
 	private Integer isVideo;
-	
+	@ApiModelProperty("内容第一张图片")
+	private String imgSrc;
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/sysuser/fg/forum/FgForumDetailsVo.java

@@ -7,6 +7,7 @@ import java.util.List;
 
 import lombok.Data;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zrqx.core.util.page.PageInfo;
 
 @Data

com.zrqx.core/src/main/java/com/zrqx/core/vo/sysuser/fg/forum/FgForumListVo.java

@@ -7,6 +7,8 @@ import java.util.List;
 
 import lombok.Data;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 @Data
 public class FgForumListVo {