diff --git a/blade-service/logpm-aftersales/src/main/resources/application-prod.yml b/blade-service/logpm-aftersales/src/main/resources/application-prod.yml index 6bef89294..07bea8516 100644 --- a/blade-service/logpm-aftersales/src/main/resources/application-prod.yml +++ b/blade-service/logpm-aftersales/src/main/resources/application-prod.yml @@ -1,6 +1,6 @@ #服务器端口 server: - port: 8900 + port: 8799 #数据源配置 #spring: diff --git a/blade-service/logpm-aftersales/src/main/resources/application-test.yml b/blade-service/logpm-aftersales/src/main/resources/application-test.yml index 9cb52f45e..9d128415e 100644 --- a/blade-service/logpm-aftersales/src/main/resources/application-test.yml +++ b/blade-service/logpm-aftersales/src/main/resources/application-test.yml @@ -1,6 +1,6 @@ #服务器端口 server: - port: 6000 + port: 8799 #数据源配置 #spring: diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java index 25d3002e6..2b4507c22 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java @@ -118,8 +118,8 @@ public class WarehouseWarehousingEntryController extends BladeController { Map queryMap = (Map) request.get("query"); Query query = new Query(); - query.setSize((Integer) queryMap.get("size")); - query.setCurrent((Integer) queryMap.get("current")); + query.setSize((Integer) queryMap.get("pageSize")); + query.setCurrent((Integer) queryMap.get("currentPage")); QueryWrapper queryWrapper = Condition.getQueryWrapper(warehouseWarehousingEntry, WarehouseWarehousingEntryEntity.class);