Commit 7061f7b791cd74c009e4041d2867462c81affc33

Authored by 王言钊
2 parents ae099014 ca84efa9

Merge branch 'test' into dev

src/main/java/com/cnlive/shenhe/api/VideosControllerApi.java
@@ -183,7 +183,7 @@ public class VideosControllerApi { @@ -183,7 +183,7 @@ public class VideosControllerApi {
183 if (CommonUtils.isNotNull(duration) && duration < 300) { 183 if (CommonUtils.isNotNull(duration) && duration < 300) {
184 shyVideos1 = avsample(shyVideos1); 184 shyVideos1 = avsample(shyVideos1);
185 } else { 185 } else {
186 - //机审超过60秒的改为人工审核 186 + //机审超过300秒的改为人工审核
187 shyVideos1.setShenhe_type(CommonConst.AUDIT_TYPE_USER); 187 shyVideos1.setShenhe_type(CommonConst.AUDIT_TYPE_USER);
188 } 188 }
189 } 189 }