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

This commit is contained in:
doufenghu
2018-07-19 10:20:38 +08:00
5 changed files with 34 additions and 26 deletions

View File

@@ -37,11 +37,11 @@ public class MmVoipLog extends LogEntity<MmVoipLog> {
protected String toFromStoreUrl;
@ApiModelProperty(value="节目ID", required=true)
protected String pid;
@ApiModelProperty(value="节目访问地址", required=true)
protected String url;
@ApiModelProperty(value="封堵现场片段路径", required=true)
protected String logUri;
@ApiModelProperty(value="封堵类型", required=true)
protected Integer level;
@ApiModelProperty(value="封堵类型", required=true)
protected Integer fdType;
public String getPid() {
@@ -50,12 +50,6 @@ public class MmVoipLog extends LogEntity<MmVoipLog> {
public void setPid(String pid) {
this.pid = pid;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public String getLogUri() {
return logUri;
}
@@ -128,4 +122,11 @@ public class MmVoipLog extends LogEntity<MmVoipLog> {
public void setToFromStoreUrl(String toFromStoreUrl) {
this.toFromStoreUrl = toFromStoreUrl;
}
public Integer getLevel() {
return level;
}
public void setLevel(Integer level) {
this.level = level;
}
}