Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # src/main/resources/generatorConfig.xml

Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # src/main/resources/generatorConfig.xml
郑超
2 parents c26e5617 de5e92a9
Showing 2 changed files with 1 additions and 2 deletions
pom.xml
src/main/java/com/cnlive/shenhe/api/VideosControllerApi.java
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
  
     <groupId>com.cnlive.shenhe</groupId>
-    <artifactId>cnlive_shenhe</artifactId>
+    <artifactId>cnlive_shenhe_test</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
  
@@ -186,7 +186,6 @@ public class VideosControllerApi {
  
     /**
      * 申请抽帧
-     *
      * @param video
      * @return
      */