--no commit message

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

@@ -17,14 +17,14 @@ import com.zrqx.core.vo.resource.videolibrary.VideoLibraryListVO;
 public interface VideoLibraryMapper extends BaseMapper<VideoLibrary> {
 	@Select("<script>" 
 			+ "<if test='form.diyTypeCode == null'>"  
-			 	+ "select distinct a.id,a.name,a.bookName,g.dataSources,g.price,g.sellingPrice,"
+			 	+ "select distinct a.id,a.name,a.bookName,g.dataSources,g.price,g.sellingPrice,g.priceType,"
 			    + "DATE_FORMAT(a.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,a.timeLength,a.size,a.source,"
 			    + "a.status,a.isDelete from res_video_library a "
 				+ "LEFT JOIN res_video_goods g on a.id=g.objectId "
 				+ "where 1=1 and a.isDelete = 0 "
 		    + "</if>"
 		    + "<if test='"+NOTBLANK+"(form.diyTypeCode)'>"  
-			    + "select distinct a.id,a.name,a.bookName,g.dataSources,g.price,g.sellingPrice,"
+			    + "select distinct a.id,a.name,a.bookName,g.dataSources,g.price,g.sellingPrice,g.priceType,"
 			    + "DATE_FORMAT(a.uploadTime,'%Y-%m-%d %H:%i:%s') uploadTime,a.timeLength,a.size,a.source,"
 			    + "a.status,a.isDelete from res_video_library a "
 				+ "LEFT join res_video_library_diy_type ad on a.id = ad.objectId "