From 04d8fb24381ddf9c5c7a56948d5e7fe230e18e7e Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Sat, 29 Sep 2018 10:31:42 +0800
Subject: [PATCH] =?UTF-8?q?voip=20ip=E5=92=8Cvoipaccount=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BF=AE=E6=94=B9sql,=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/sql/20180928/update_voip.sql        | 5 +++++
 src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 src/main/resources/sql/20180928/update_voip.sql

diff --git a/src/main/resources/sql/20180928/update_voip.sql b/src/main/resources/sql/20180928/update_voip.sql
new file mode 100644
index 000000000..9b8726f81
--- /dev/null
+++ b/src/main/resources/sql/20180928/update_voip.sql
@@ -0,0 +1,5 @@
+ #voip ip跟voip account 合二为一
+update sys_menu set href = "/ntc/av/voipList" where id = 831;
+update function_service_dict set service_name='av_voip_monit' where dict_id=17
+update function_service_dict set service_name='av_voip_reject' where dict_id=16
+update function_region_dict set config_region_value='MM_SUBSCRIBE_ID',function_id=24,config_region_code=2 where dict_id=208
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 f0e433c1f..dc5cff0d9 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
@@ -146,6 +146,7 @@
 		<h3 class="page-title">
 			<spring:message code="av_voip_control"></spring:message>
 		</h3>
+		<span style="color: red;font-size: 14px;letter-spacing: 0px;"> <spring:message code="protocol_note"></spring:message></span>
 		<div class="row">
 			<div class="col-md-12">
 				<div class="portlet box blue">