NTCIPRANCE报表查询调整

src/main/java/com/nis/domain/report/NtcIpRangeReport.java

@@ -13,19 +13,56 @@ public class NtcIpRangeReport extends BaseLogEntity<NtcIpRangeReport>{
 	protected String ipStart;
 	@ExcelField(title="ip_end",sort=9)
 	protected String ipEnd;
-	@ExcelField(title="ip_start_num",sort=10)
+	//@ExcelField(title="ip_start_num",sort=10)
 	protected BigInteger ipStartNum;
-	@ExcelField(title="ip_end_num",sort=11)
+	//@ExcelField(title="ip_end_num",sort=11)
 	protected BigInteger ipEndNum;
 	@ExcelField(title="ip_sub",sort=12)
 	protected String ipSub;
+	@ExcelField(title="country",sort=13)
+	protected String country;
+	public String getCountry() {
+		return country;
+	}
+	public void setCountry(String country) {
+		this.country = country;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+	@ExcelField(title="desc",sort=14)
+	protected String desc;
 	
 	protected String searchCountry;//国家
 	protected String searchStartIp;//开始IP
 	protected String searchEndIp;//结束IP
+	protected String searchIp;//IP
+	protected String searchAreaType;//area 1境内；1境外
+	protected String searchDesc;//
 	
 	
 	
+	public String getSearchDesc() {
+		return searchDesc;
+	}
+	public void setSearchDesc(String searchDesc) {
+		this.searchDesc = searchDesc;
+	}
+	public String getSearchAreaType() {
+		return searchAreaType;
+	}
+	public void setSearchAreaType(String searchAreaType) {
+		this.searchAreaType = searchAreaType;
+	}
+	public String getSearchIp() {
+		return searchIp;
+	}
+	public void setSearchIp(String searchIp) {
+		this.searchIp = searchIp;
+	}
 	public String getSearchCountry() {
 		return searchCountry;
 	}