--no commit message

app/resource/src/main/java/com/zrqx/resource/bg/mapper/ResourceRelationMapper.java

@@ -88,7 +88,7 @@ public interface ResourceRelationMapper  extends BaseMapper<ResourceRelation> {
 	
 	// TODO 直播分类表
 	@Select("<script>"
-			+ "select DISTINCT a.id,a.name,a.author,a.img,a.status, DATE_FORMAT(a.createTime,'%Y-%m-%d %H:%i:%s') uploadTime "
+			+ "select DISTINCT a.id,a.name,a.author,a.img,a.status, DATE_FORMAT(a.createTime,'%Y-%m-%d %H:%i:%s') uploadTime, a.resourceType "
 			+ "FROM `hxkf-live`.l_live a  "
 			//+ "on a.id = t.courselibraryid "
 			+ " where 1 = 1 and a.status = 1 "

app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/live/LiveVO.java

@@ -22,4 +22,6 @@ public class LiveVO {
 	private String status_zh;
 	@ApiModelProperty("创建时间")
 	private Date createTime;
+	@ApiModelProperty("资源类型")
+	private Integer resourceType;
 }