Merge branch 'feature/bug-1333' into feature/quotation

nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ProductVideoVO.java

@@ -1,5 +1,6 @@
 package com.nflg.mobilebroken.common.pojo.vo;
 
+import cn.hutool.core.util.StrUtil;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
@@ -10,9 +11,18 @@ public class ProductVideoVO extends ProductImageVO{
     /**
      * 类型，0-视频；1：图片
      */
-    @NotNull
     private Integer type;
 
+    public Integer getType() {
+        if (StrUtil.isNotBlank(video)) {
+            return 0;
+        }
+        if (StrUtil.isNotBlank(getImage())) {
+            return 1;
+        }
+        return null;
+    }
+
     /**
      * 视频地址
      */