Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

develop

Conflicts:
	src/main/webapp/WEB-INF/include/excel/importModal.jsp
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
增加region和service导入属性，动态控制导入业务
优化导入界面

src/main/java/com/nis/domain/FunctionRegionDict.java

@@ -28,6 +28,14 @@ public class FunctionRegionDict extends BaseCfg<FunctionRegionDict> {
 	private String configDirection;
 	private String configProtocol;
 	private Integer configRegionSort;
+	private Integer isImport;
+	
+	public Integer getIsImport() {
+		return isImport;
+	}
+	public void setIsImport(Integer isImport) {
+		this.isImport = isImport;
+	}
 	
 	public Integer getConfigRegionSort() {
 		return configRegionSort;

src/main/java/com/nis/domain/FunctionServiceDict.java

@@ -18,6 +18,15 @@ public class FunctionServiceDict extends BaseCfg<FunctionServiceDict> {
 	private String actionCode;
 	private String regionCode;
 	
+	private Integer isImport;
+	
+	public Integer getIsImport() {
+		return isImport;
+	}
+	public void setIsImport(Integer isImport) {
+		this.isImport = isImport;
+	}
+	
 	public String getRegionCode() {
 		return regionCode;
 	}

src/main/java/com/nis/domain/configuration/template/IpPayloadTemplate.java

@@ -23,14 +23,14 @@ public class IpPayloadTemplate extends IpAllTemplate {
 	public String getUserRegion2() {
 		return userRegion2;
 	}
-	public void setUserRegion2(String userRegion1) {
+	public void setUserRegion2(String userRegion2) {
 		this.userRegion2 = userRegion2;
 	}
 	@ExcelField(title="replace_content",align=2,sort=4)
 	public String getUserRegion3() {
 		return userRegion3;
 	}
-	public void setUserRegion3(String userRegion1) {
+	public void setUserRegion3(String userRegion3) {
 		this.userRegion3 = userRegion3;
 	}
 }