Merge remote-tracking branch 'origin/master'

src/main/java/com/aoyang/tms/controller/TruckEscortController.java

@@ -75,7 +75,7 @@ public class TruckEscortController {
         return new Result<>(truckEscortService.list(param));
     }
 
-    @ApiOperation(value = "车辆绑定押运员", notes = "必传参数:truckId")
+    @ApiOperation(value = "车辆绑定/解绑押运员", notes = "必传参数:truckId")
     @PostMapping("/bind_truck")
     public Result bind(@RequestHeader(value = "userId") Long userId,
                          @RequestHeader(value = "userName") String userName, @RequestHeader(value = "orgId") Long orgId,

src/main/java/com/aoyang/tms/service/impl/TruckEscortServiceImpl.java

@@ -144,7 +144,7 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
             return flag;
         } else {
             LambdaUpdateWrapper<TruckEscort> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.eq(TruckEscort::getTruckId, param.getTruckId());
+            updateWrapper.eq(TruckEscort::getEscortId, param.getEscortId());
             updateWrapper.set(TruckEscort::getTruckId, param.getTruckId());
             updateWrapper.set(TruckEscort::getCarNumber, param.getCarNumber());
             updateWrapper.set(TruckEscort::getUpdater, param.getUpdater());