From afda10b3cb75b058f267866835ca4de219bf80c8 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Fri, 20 Jul 2018 09:32:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97VoIP=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9B=BD=E9=99=85=E5=8C=96=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties    | 2 +-
 src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 72a3c3b91..60bb7dfc4 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -705,7 +705,7 @@ qname=Query Content
 cname=cname
 dns_query=Request
 dns_response=Response
-entrance=\u51FA\u5165\u53E3
+entrance=entrance
 #dns_sub=DNS_SUB
 mail_proto=Mail Protocol 
 mail_from=Sender
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp
index 3dde0735a..af724e14e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipList.jsp
@@ -173,7 +173,6 @@ $(document).ready(function(){
 									<th><spring:message code='recv_time'/></th>
 									<th><spring:message code='protocol'/></th>
 									
-									<th><spring:message code='voip_recv_time'/></th>
 									<th><spring:message code='duation'/></th>
 									<th><spring:message code='voip_protocol'/></th>
 									<th><spring:message code='calling_account'/></th>
@@ -220,7 +219,6 @@ $(document).ready(function(){
 									<td>${log.recvTime}</td>
 									<td>${log.transProto}</td>
 									
-									<td>${log.recvTime}</td>
 									<td>${log.duation}</td>
 									<td>${log.protocol}</td>
 									<td>${log.callingAccount}</td>