Merge branch 'quanku_v2.7' into quanku_v2.7.1

# Conflicts:
#	ch-core/src/main/java/com/wwdz/ch/core/util/MediaUtil.java

ch-core/src/main/java/com/wwdz/ch/core/util/MediaUtil.java

@@ -111,10 +111,14 @@ public class MediaUtil {
             if (image[0].contains("_")) {
                 homePageMap = getAspect(image[0]);
                 homePageMap.put("url", image[0]);
-                homePageMap.put("type", 2);
+                if (org.apache.commons.lang3.StringUtils.isNotBlank(videos)) {
+                    homePageMap.put("type", 1);
+                } else {
+                    homePageMap.put("type", 2);
+                }
             }
         }
-       /* if (org.apache.commons.lang3.StringUtils.isNotBlank(videos)) {
+        /*if (org.apache.commons.lang3.StringUtils.isNotBlank(videos)) {
             String[] videoImage = videos.split(";");
             if (videoImage[0].contains(",")) {
                 String[] video = videoImage[0].split(",");