Merge branch 'xgh_内容中台' into 'developer'

视频

See merge request !479

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialServiceImpl.java

@@ -174,6 +174,9 @@ public class MaterialServiceImpl implements MaterialService {
 	        if (type == 4) {
 	            fileType = QywxMediaTypeEnum.VIDEO;
 	            url = old.getLink();
+	            if(from == 2) {
+	                url = entity.getImgUrl() ;
+	            }
 	        }
 	        if (type == 5) {
 	            fileType = QywxMediaTypeEnum.FILE;