--no commit message

app/resource/src/main/java/com/zrqx/resource/bg/mapper/videolibrary/VideoLibraryMapper.java

@@ -47,7 +47,7 @@ public interface VideoLibraryMapper extends BaseMapper<VideoLibrary> {
 	List<VideoLibraryListVO> query(@Param("form")QueryVideoLibraryForm form);
 	
 	@Select("<script>" 
-			+ "select a.id,a.name,a.source,a.author,a.bookName,a.price,a.timeLength,a.size,a.uploadTime,a.status,a.cover "
+			+ "select a.id,a.name,a.source,a.author,a.bookName,a.price,a.timeLength,a.size,a.uploadTime,a.status,a.cover,a.video "
 			+ "from res_Video_Library a left join res_Video_Library_Diy_Type ad "
 			+ "on a.id = ad.vlid "
 			+ "where 1=1 and a.status = 1 "

app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/videolibrary/VideoLibraryListVO.java

@@ -14,6 +14,8 @@ public class VideoLibraryListVO {
 	private String name;
 	@ApiModelProperty("来源")
 	private String source;
+	@ApiModelProperty("视频")
+	private String video;
 	@ApiModelProperty("售价")
 	private String realPrice;
 	@ApiModelProperty("上传时间")

app/resource/src/main/java/com/zrqx/resource/commons/vo/fg/resource/FgAboutListVo.java

@@ -22,4 +22,6 @@ public class FgAboutListVo  {
 	private String synopsis;
 	@ApiModelProperty("浏览数量")
 	private Integer browseNum;
+	@ApiModelProperty("视频")
+	private String video;
 }

app/resource/src/main/java/com/zrqx/resource/fg/mapper/FgResourceRelationMapper.java

@@ -35,7 +35,7 @@ public interface FgResourceRelationMapper  extends BaseMapper<ResourceRelation>
 	 * @return
 	 */
 	@Select("<script>"
-			+ "select vi.id ,vi.name, vi.resourceType, vi.cover,vi.text as synopsis "
+			+ "select vi.id ,vi.name, vi.resourceType, vi.cover,vi.text as synopsis,vi.video "
 			+ "from res_resource_relation ar "
 			+ "left join res_article_library vi on ar.resourceId = vi.id "
 			+ "where 1 = 1 "