Merge remote-tracking branch 'origin/fix_bug_20231216' into fix_bug_20231216

blade-service/logpm-factory/src/main/resources/application.yml

@@ -46,5 +46,5 @@ xxl:
       ip: 127.0.0.1
       logpath: ../data/applogs/logpm-factory-xxljob/jobhandler
       logretentiondays: -1
-      port: 7019
+      port: 7018
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java

@@ -246,10 +246,10 @@ public class CarsLoadController {
 				return R.fail(400,"仓库信息为空");
 			}
 			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
-			if(Objects.isNull(loadId)){
-				log.warn(method+"配载id为空 loadId={}",loadId);
-				return R.fail(400,"配载id为空");
-			}
+//			if(Objects.isNull(loadId)){
+//				log.warn(method+"配载id为空 loadId={}",loadId);
+//				return R.fail(400,"配载id为空");
+//			}
 
 			return carsLoadService.findAllOrderList(loadCarsDTO);
 		}catch (CustomerException e){