-

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/CompanySearchController.java

@@ -44,6 +44,8 @@ public class CompanySearchController {
     public AjaxResult page(@RequestBody ComposeQueryDto compose) {
         compose.getPage().setPage(compose.getPageNum());
         compose.getPage().setLimit(compose.getPageSize());
+        compose.getPage().setField(compose.getField());
+        compose.getPage().setOrder(compose.getOrder());
         return opportunityRadarService.enterprisePage(compose);
     }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/RegionalEconomicDataController.java

@@ -74,7 +74,6 @@ public class RegionalEconomicDataController {
     public AjaxResult location(@RequestBody OpRegionalLocalDto vo, HttpServletRequest request){
         String ip = IpUtil.getIpAddr(request);
         vo.setIp(ip);
-        log.info("location====================================>" +ip);
         return economicService.location(vo);
     }
 

dsk-common/src/main/java/com/dsk/common/core/domain/model/BasePage.java

@@ -34,6 +34,10 @@ public class BasePage {
 	 */
 	private Integer pageMaxSize;
 
+	private String field;
+
+	private String order;
+
 	
 	public Integer getPageIndex() {
 		return pageNum;
@@ -74,6 +78,22 @@ public class BasePage {
 		this.pageIndex = pageNum;
 	}
 
+	public String getField() {
+		return field;
+	}
+
+	public void setField(String field) {
+		this.field = field;
+	}
+
+	public String getOrder() {
+		return order;
+	}
+
+	public void setOrder(String order) {
+		this.order = order;
+	}
+
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder();