Merge remote-tracking branch 'origin/main'

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppOperationVideoController.java

@@ -64,8 +64,8 @@ public class AppOperationVideoController extends BaseController {
     /**
      * 操作视频删除
      */
-    @DeleteMapping("/deleteOperationVideo")
-    public R<Void> deleteOperationVideo(Long[] ids) {
-        return toAjax(appOperationVideoService.deleteWithValidByIds(List.of(ids), true));
+    @DeleteMapping("/deleteOperationVideo/{id}")
+    public R<Void> deleteOperationVideo(@PathVariable Long id) {
+        return toAjax(appOperationVideoService.deleteWithValidByIds(List.of(id), true));
     }
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java

@@ -547,7 +547,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
             deviceUpdateWrapper.eq("id", device.getId())
                     .set("binding_status", BindingStatusEnum.BOUND.getCode())
                     .set("binding_user_id", userId);
-            return baseMapper.update(null, qw);
+            return baseMapper.update(null, deviceUpdateWrapper);
         } else {
             throw new RuntimeException("通讯方式错误");
         }