diff --git a/src/main/java/com/nis/domain/restful/MmSampleVoipLog.java b/src/main/java/com/nis/domain/restful/MmSampleVoipLog.java index 7caf940..afa40fb 100644 --- a/src/main/java/com/nis/domain/restful/MmSampleVoipLog.java +++ b/src/main/java/com/nis/domain/restful/MmSampleVoipLog.java @@ -15,7 +15,7 @@ public class MmSampleVoipLog extends LogEntity { @ApiModelProperty(value = "VOIP通话时长(秒)", required = true) protected String duation; @ApiModelProperty(value = "VOIP协议", required = true) - protected String protocol; + protected String voipProtocol; @ApiModelProperty(value = "主叫VOIP账号", required = true) protected String callingAccount; @ApiModelProperty(value = "被叫VOIP账号", required = true) @@ -64,13 +64,17 @@ public class MmSampleVoipLog extends LogEntity { public void setFdType(Integer fdType) { this.fdType = fdType; } - - public String getProtocol() { - return protocol; + /** + * @return the voipProtocol + */ + public String getVoipProtocol() { + return voipProtocol; } - - public void setProtocol(String protocol) { - this.protocol = protocol; + /** + * @param voipProtocol the voipProtocol to set + */ + public void setVoipProtocol(String voipProtocol) { + this.voipProtocol = voipProtocol; } public String getDuation() { diff --git a/src/main/java/com/nis/domain/restful/MmVoipAccountLog.java b/src/main/java/com/nis/domain/restful/MmVoipAccountLog.java index 7b85045..e0b0dfe 100644 --- a/src/main/java/com/nis/domain/restful/MmVoipAccountLog.java +++ b/src/main/java/com/nis/domain/restful/MmVoipAccountLog.java @@ -18,7 +18,7 @@ public class MmVoipAccountLog extends LogEntity { @ApiModelProperty(value="VOIP通话时长(秒)", required=true) protected String duation; @ApiModelProperty(value="VOIP协议", required=true) - protected String protocol; + protected String voipProtocol; @ApiModelProperty(value="主叫VOIP账号", required=true) protected String callingAccount; @ApiModelProperty(value="被叫VOIP账号", required=true) @@ -62,11 +62,17 @@ public class MmVoipAccountLog extends LogEntity { public void setFdType(Integer fdType) { this.fdType = fdType; } - public String getProtocol() { - return protocol; + /** + * @return the voipProtocol + */ + public String getVoipProtocol() { + return voipProtocol; } - public void setProtocol(String protocol) { - this.protocol = protocol; + /** + * @param voipProtocol the voipProtocol to set + */ + public void setVoipProtocol(String voipProtocol) { + this.voipProtocol = voipProtocol; } public String getDuation() { return duation; diff --git a/src/main/java/com/nis/domain/restful/MmVoipIpLog.java b/src/main/java/com/nis/domain/restful/MmVoipIpLog.java index ffa8a9d..3f8fbe5 100644 --- a/src/main/java/com/nis/domain/restful/MmVoipIpLog.java +++ b/src/main/java/com/nis/domain/restful/MmVoipIpLog.java @@ -18,7 +18,7 @@ public class MmVoipIpLog extends LogEntity { @ApiModelProperty(value="VOIP通话时长(秒)", required=true) protected String duation; @ApiModelProperty(value="VOIP协议", required=true) - protected String protocol; + protected String voipProtocol; @ApiModelProperty(value="主叫VOIP账号", required=true) protected String callingAccount; @ApiModelProperty(value="被叫VOIP账号", required=true) @@ -62,11 +62,17 @@ public class MmVoipIpLog extends LogEntity { public void setFdType(Integer fdType) { this.fdType = fdType; } - public String getProtocol() { - return protocol; + /** + * @return the voipProtocol + */ + public String getVoipProtocol() { + return voipProtocol; } - public void setProtocol(String protocol) { - this.protocol = protocol; + /** + * @param voipProtocol the voipProtocol to set + */ + public void setVoipProtocol(String voipProtocol) { + this.voipProtocol = voipProtocol; } public String getDuation() { return duation; diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml index 6cfa2d2..1aad9a7 100644 --- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml +++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml @@ -549,7 +549,7 @@ - + @@ -585,7 +585,7 @@ - + @@ -769,7 +769,7 @@ - +