From d0ffbe9f1cbd44dd033803b48c9fca2dffef1e24 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Tue, 22 May 2018 11:14:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=85=8D=E7=BD=AE=E5=9F=9F?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=A2=9E=E5=8A=A0region=5Ftype=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=B1=9E=E6=80=A7=EF=BC=8C=E6=A0=87=E8=AF=86=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=9F=9F=E7=B1=BB=E5=88=AB=EF=BC=8C1IP=E7=B1=BB?=
 =?UTF-8?q?=EF=BC=8C2=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=B1=BB=EF=BC=8C3?=
 =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=B1=BB=EF=BC=8C?=
 =?UTF-8?q?4=E6=95=B0=E5=80=BC=E7=B1=BB=EF=BC=8C5=E6=91=98=E8=A6=81?=
 =?UTF-8?q?=E7=B1=BB=EF=BC=8C6=E5=9B=9E=E8=B0=83=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/FunctionRegionDict.java    | 7 +++++++
 src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/nis/domain/FunctionRegionDict.java b/src/main/java/com/nis/domain/FunctionRegionDict.java
index c597b784a..de8dc0f9c 100644
--- a/src/main/java/com/nis/domain/FunctionRegionDict.java
+++ b/src/main/java/com/nis/domain/FunctionRegionDict.java
@@ -15,6 +15,7 @@ public class FunctionRegionDict extends BaseCfg<FunctionRegionDict> {
 	private String configDistrict;
 	private String configDesc;
 	private Integer isMaat;
+	private Integer regionType;
 	public Integer getDictId() {
 		return dictId;
 	}
@@ -57,5 +58,11 @@ public class FunctionRegionDict extends BaseCfg<FunctionRegionDict> {
 	public void setIsMaat(Integer isMaat) {
 		this.isMaat = isMaat;
 	}
+	public Integer getRegionType() {
+		return regionType;
+	}
+	public void setRegionType(Integer regionType) {
+		this.regionType = regionType;
+	}
 
 }
diff --git a/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml b/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml
index 7d8e2d6b7..34cc7f18d 100644
--- a/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml
+++ b/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml
@@ -10,10 +10,11 @@
     <result column="config_desc" property="configDesc" jdbcType="VARCHAR" />
     <result column="is_valid" property="isValid" jdbcType="INTEGER" />
     <result column="is_maat" property="isMaat" jdbcType="INTEGER" />
+    <result column="region_type" property="regionType" jdbcType="INTEGER" />
   </resultMap>
   
   <sql id="Base_Column_List" >
-    dict_id, function_id, config_region_value,config_region_code, config_district, config_desc, is_valid,is_maat
+    dict_id, function_id, config_region_value,config_region_code, config_district, config_desc, is_valid,is_maat,region_type
   </sql>
   <select id="getList" resultMap="BaseResultMap"  >
     select