rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
@@ -145,6 +145,7 @@ @ApiOperation("组拖") @PostMapping("/waitPakin/merge") public R pikinOrder(@RequestBody WaitPakinParam waitPakin) { Long userId = getLoginUserId(); if (Objects.isNull(waitPakin)) { return R.error("参数不能为空！！"); } @@ -154,7 +155,7 @@ if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) { return R.error("跟踪码不能为空！！"); } return R.ok(mobileService.mergeItems(waitPakin)); return R.ok(mobileService.mergeItems(waitPakin, userId)); } @PreAuthorize("hasAuthority('manager:waitPakin:update')")
