From bd3ac19a837f66ab1d442ca96591a65a9bd5ade8 Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Fri, 14 Sep 2018 19:52:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E8=84=B8?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E9=98=BB=E6=96=AD=E5=92=8C=E7=9B=91=E6=B5=8B?=
 =?UTF-8?q?=E7=9A=84serviceId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/sql/20180914/update_function_service_dict.sql    | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 src/main/resources/sql/20180914/update_function_service_dict.sql

diff --git a/src/main/resources/sql/20180914/update_function_service_dict.sql b/src/main/resources/sql/20180914/update_function_service_dict.sql
new file mode 100644
index 000000000..c8b2bf348
--- /dev/null
+++ b/src/main/resources/sql/20180914/update_function_service_dict.sql
@@ -0,0 +1,3 @@
+#修改人脸识别阻断和监测的serviceId
+UPDATE `function_service_dict` SET `service_id`='268' , `action`='16'  WHERE `dict_id`='121';
+UPDATE `function_service_dict` SET `service_id`='396' , `action`='1'  WHERE `dict_id`='122';
\ No newline at end of file

From fe68f75c1b46062f57fac6492c9369d043fa8f71 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Sat, 15 Sep 2018 13:08:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=A0=B7=E4=BE=8B=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E4=BF=AE=E6=94=B9level=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
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/cfg/av/fileSampleForm.jsp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 727ac2fc8..fb86b857b 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -980,7 +980,7 @@ day_of_month_report=Daily Report
 month_report=Monthly Report
 label_report=Tag Report
 attr_type_report=Attribute Report
-lwhh_report=icial Letter Report
+lwhh_report=Icial Letter Report
 src_ip_report=Src IP Report
 dest_ip_report=Dest IP Report
 isp_report=Entrance Report
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
index 2bd43db5b..296bbb996 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
@@ -91,7 +91,7 @@ function hiddenlevel(){
 		$("input[name='level']").val(0);
 	}else {
 		$(".leveL").removeClass("hidden");
-		$("input[name='level']").val('');
+// 		$("input[name='level']").val('');
 	}
 }
 </script>
@@ -219,7 +219,7 @@ function hiddenlevel(){
 							        <div class="form-group ">
 							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="harm_level"/></label>
 							            <div class="col-md-6">
-							            	 <input class="form-control required number" range="[0,100]" type="text" name="level" value="">
+							            	 <input class="form-control required number" range="[0,100]" type="text" name="level" value="${_cfg.level }">
 							            </div>
 							            <div for="level"></div>
 							        </div>