Commit f9e342f1565cbff2a14734c4cb3457c4437ddef7

Authored by 刘基城
2 parents 49013103 24e5d13e

Merge branch 'master' of http://bj.gitlab.cnlive.com/liujicheng/cnlive_live_web into v532

src/main/java/com/cnlive/mz/live/action/VideoAction.java
@@ -107,7 +107,7 @@ public class VideoAction { @@ -107,7 +107,7 @@ public class VideoAction {
107 tLive.setDescription(description); 107 tLive.setDescription(description);
108 tLive.setStart_time(new Date()); 108 tLive.setStart_time(new Date());
109 tLive.setUser_uuid(params.getString("name")); 109 tLive.setUser_uuid(params.getString("name"));
110 - tLive.setRelation_id(Integer.parseInt(relation_id)); 110 + tLive.setRelation_id(relation_id);
111 tLive.setCustom_args(custom_args); 111 tLive.setCustom_args(custom_args);
112 uuid = tLive.getUuid(); 112 uuid = tLive.getUuid();
113 if (StringUtils.isEmpty(direct)) { 113 if (StringUtils.isEmpty(direct)) {