From 33fd4df21dbc644e5cf6ec244f3806d147e115bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=9A=93=E5=AE=B8?= <liguilong@iie.ac.cn>
Date: Tue, 7 May 2019 13:52:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=8F=9C=E5=8D=95=E4=B8=AD=E7=9A=84=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=E8=AF=AD=E8=A8=80=E4=B8=8B,=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=8D=E6=98=AF=E4=B8=AD=E6=96=87=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3=202.VOIP=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87,=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=97=B6=E9=97=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/dao/configuration/AvContentCfgDao.xml    |  3 +++
 .../resources/messages/message_zh_CN.properties  | 16 ++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
index ca2324a91..815a75190 100644
--- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
@@ -2129,6 +2129,9 @@
     <if test="isAudit != null">
     is_audit = #{isAudit,jdbcType=INTEGER},
     </if>
+	<if test="auditTime !=null ">
+	audit_time = #{auditTime,jdbcType=TIMESTAMP},
+	</if>
     editor_id = #{editorId,jdbcType=INTEGER} , 
     edit_time = #{editTime,jdbcType=TIMESTAMP} 
     <trim prefix="WHERE" prefixOverrides="AND |OR ">
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index d3110b551..188dc46d9 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1116,11 +1116,11 @@ access_policy=\u8bbf\u95ee\u7b56\u7565
 nat_policy=\u5730\u5740\u8f6c\u6362\u7b56\u7565
 dns_policy_object=DNS\u7b56\u7565\u5bf9\u8c61
 proxy_policy_object=Proxy\u7b56\u7565\u5bf9\u8c61 
-APP_PAYLOAD_ADMIN=APP Payload Admin
-APP_HTTP_ADMIN=APP HTTP Admin
-APP_DNS_ADMIN=APP DNS Admin
-APP_SSL_ADMIN=APP SSL Admin
-APP_DK_GL=APP Correlation Feature
+APP_PAYLOAD_ADMIN=APP Payload \u7279\u5f81
+APP_HTTP_ADMIN=APP HTTP \u7279\u5f81
+APP_DNS_ADMIN=APP DNS \u7279\u5f81
+APP_SSL_ADMIN=APP SSL \u7279\u5f81
+APP_DK_GL=APP \u5173\u8054\u7279\u5f81
 dnat_complex_loop=DNAT IP\u590d\u7528\u56de\u6d41
 snat_policy=SNAT\u590d\u7528\u7b56\u7565
 dnat_policy=DNAT\u590d\u7528\u7b56\u7565
@@ -1376,12 +1376,12 @@ spoofing=spoofing
 service=Service
 s_asn=SASN
 d_asn=DASN
-asn_conn_report=ASN Statistics
-https_url_report=Http(s) URL Statistics
+asn_conn_report=ASN\u7edf\u8ba1
+https_url_report=Http(s) URL\u7edf\u8ba1
 url=URL
 sum=SUM
 url_count=URL Count
-ip_range_report=IN/EX Host Identity
+ip_range_report=IP\u8303\u56f4\u7edf\u8ba1
 ip_start=Start IP
 ip_end=End IP
 ip_start_num=IP Start Num