Merge branch 'dev'

# Conflicts: # src/main/java/com/cnlive/shenhe/api/ChannelControllerApi.java

Merge branch 'dev'
# Conflicts: # src/main/java/com/cnlive/shenhe/api/ChannelControllerApi.java
徐近程
2 parents e80f7c97 c09f4b9c
Showing 1 changed file with 1 additions and 1 deletions
src/main/java/com/cnlive/shenhe/api/ChannelControllerApi.java
@@ -35,7 +35,7 @@ public class ChannelControllerApi {
     /**
      * @Auther: liwei
      * @Date: 2019/08/17 11:17
-     * @Description: 频道送审接口5
+     * @Description: 频道送审接口
      */
     @PostMapping("/import")
     @ResponseBody