asn 相关修改提交

(1)asn_ip_cfg增加四列
(2)新增asn_group_info表
(3)asn ip菜单移动到policy object下，新增审核审计菜单
(4)asn ip导入修改,适应新的需求放弃了使用AsnCache，直接从数据库查
(5)asn ip加入审核流程
(6)Packet IP选择asn时，改为选中一个组织，审核下发的配置为as号字符串域
(7)asn ip 新增业务新增function_service_dict字典，serviceId为400

src/main/java/com/nis/domain/basics/AsnIpCfg.java

@@ -28,7 +28,7 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
 	private Integer portPattern; 
 	private String srcPort; 
 	private String destPort; 
-	@ExcelField(title="group",sort=2)
+	//@ExcelField(title="group",sort=2)
 	private String asnIpGroupName;//asn组名
 	private Integer asnIpGroup;//asn组号
 	/**
@@ -48,9 +48,39 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
 	
 	@ExcelField(title="is_issued",dictType="VALID_IDENTIFIER",sort=90)
 	private String isIssued;
+	@ExcelField(title="organization",sort=91)
+	private String organization;
+	@ExcelField(title="country",sort=92)
+	private String country;
+	@ExcelField(title="detail",sort=93)
+	private String detail;
+	private String userregion1;
 	
 	
-	
+	public String getUserregion1() {
+		return userregion1;
+	}
+	public void setUserregion1(String userregion1) {
+		this.userregion1 = userregion1;
+	}
+	public String getOrganization() {
+		return organization;
+	}
+	public void setOrganization(String organization) {
+		this.organization = organization;
+	}
+	public String getCountry() {
+		return country;
+	}
+	public void setCountry(String country) {
+		this.country = country;
+	}
+	public String getDetail() {
+		return detail;
+	}
+	public void setDetail(String detail) {
+		this.detail = detail;
+	}
 	public String getIsIssued() {
 		return isIssued;
 	}