Merge branch 'xgh_内容中台' into developer

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/ContentMaterialInfoVO.java

@@ -93,6 +93,11 @@ public class ContentMaterialInfoVO implements Serializable {
      */
     private List<SimpleGoodsInfoVO> contentGoodsList;
 
+    /**
+     * 视频时长
+     */
+    private Integer duration;
+
 
     public Long getContentMaterialId() {
         return contentMaterialId;
@@ -213,4 +218,12 @@ public class ContentMaterialInfoVO implements Serializable {
     public void setMaterialThumbnailImageUrls(List<String> materialThumbnailImageUrls) {
         this.materialThumbnailImageUrls = materialThumbnailImageUrls;
     }
+
+    public Integer getDuration() {
+        return duration;
+    }
+
+    public void setDuration(Integer duration) {
+        this.duration = duration;
+    }
 }