Commit 520407de65bef55745646a75016934bcb00f7125

Authored by 徐近程
2 parents e80f7c97 c09f4b9c

Merge branch 'dev'

# Conflicts:
#	src/main/java/com/cnlive/shenhe/api/ChannelControllerApi.java
src/main/java/com/cnlive/shenhe/api/ChannelControllerApi.java
@@ -35,7 +35,7 @@ public class ChannelControllerApi { @@ -35,7 +35,7 @@ public class ChannelControllerApi {
35 /** 35 /**
36 * @Auther: liwei 36 * @Auther: liwei
37 * @Date: 2019/08/17 11:17 37 * @Date: 2019/08/17 11:17
38 - * @Description: 频道送审接口5 38 + * @Description: 频道送审接口
39 */ 39 */
40 @PostMapping("/import") 40 @PostMapping("/import")
41 @ResponseBody 41 @ResponseBody