Merge branch 'dev' into pre-production

blade-service/logpm-aftersales/src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 #服务器端口
 server:
-  port: 8900
+  port: 8799
 
 #数据源配置
 #spring:

blade-service/logpm-aftersales/src/main/resources/application-test.yml

@@ -1,6 +1,6 @@
 #服务器端口
 server:
-  port: 6000
+  port: 8799
 
 #数据源配置
 #spring:

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java

@@ -118,8 +118,8 @@ public class WarehouseWarehousingEntryController extends BladeController {
 
 		Map<String, Object> 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<WarehouseWarehousingEntryEntity> queryWrapper = Condition.getQueryWrapper(warehouseWarehousingEntry, WarehouseWarehousingEntryEntity.class);