From 6155a7992d0dfb812b1c52f421c9fadb04041fd1 Mon Sep 17 00:00:00 2001
From: renkaige <renkaige@iie.ac.cn>
Date: Tue, 18 Dec 2018 01:35:44 +0600
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9desc=E4=B8=BAdesc=5Fdetail?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/dao/NtcReportDao.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/NtcReportDao.xml b/src/main/java/com/nis/web/dao/NtcReportDao.xml
index 68353d7..9bde8c3 100644
--- a/src/main/java/com/nis/web/dao/NtcReportDao.xml
+++ b/src/main/java/com/nis/web/dao/NtcReportDao.xml
@@ -99,7 +99,7 @@
 		<result column="ip_sub" jdbcType="VARCHAR" property="ipSub" />
 		<result column="country" jdbcType="VARCHAR" property="country" />
 		<result column="area_type" jdbcType="VARCHAR" property="areaType" />
-		<result column="desc" jdbcType="VARCHAR" property="desc" />
+		<result column="desc_detail" jdbcType="VARCHAR" property="desc" />
 	</resultMap>
 
 
@@ -858,7 +858,7 @@
 	<select id="findNtcIpRangeReport"
 		parameterType="com.nis.domain.restful.NtcIpRangeReport"
 		resultMap="NtcIpRangeReportMap">
-		SELECT ip_start,ip_end,ip_start_num,ip_end_num,ip_sub,country,area_type,desc
+		SELECT ip_start,ip_end,ip_start_num,ip_end_num,ip_sub,country,area_type,desc_detail
 		FROM
 		traffic_ip_identify
 		<where>
@@ -872,7 +872,7 @@
 				<![CDATA[AND ip_start_num>= #{searchIp} and ip_end_num<=#{searchIp}]]>
 			</if>
 		<if test="searchDesc != null and searchDesc !=''">
-				<![CDATA[AND desc= #{searchDesc} ]]>
+				<![CDATA[AND desc_detail= #{searchDesc} ]]>
 			</if>
 		</where>
 	</select>