From fa032e2b728c368b9bbbd9d5e7cfc6f62a49393f Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Fri, 13 Jul 2018 19:46:16 +0800
Subject: [PATCH] =?UTF-8?q?voip=E7=95=8C=E9=9D=A2=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E5=9B=BD=E5=AE=B6=E5=8C=96code?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8null=5Fexpression=E5=92=8Cand=5Fexpression?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
index 71a18fa98..154cd6886 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
@@ -213,12 +213,12 @@ var delContent=function(contentClassName,addBtnClassName){
 									            	<label class="radio-inline">
 									            		<input type="radio" name="voipAccounts[${status.index }].exprType" value="1" class="required"
 									            			<c:if test="${voipAccount.exprType==1}">checked</c:if>
-									            		><spring:message code="and"/>
+									            		><spring:message code="and_expression"/>
 									            	</label>
 									            	<label class="radio-inline">
 									            		<input type="radio" name="voipAccounts[${status.index }].exprType" value="0" class="required"
 									            			<c:if test="${voipAccount.exprType==0 || voipAccount.exprType==null}">checked</c:if>
-									            		><spring:message code="null"/>
+									            		><spring:message code="null_expression"/>
 									            	</label>
 									            </div>
 									            <div for="voipAccounts[${status.index }].exprType"></div>