From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneManageController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneManageController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneManageController.java
index f71b7bb..c2caa5b 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneManageController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneManageController.java
@@ -109,7 +109,7 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入fwDefenseSceneManage")
public R submit(@Valid @RequestBody FwDefenseSceneManageDTO fwDefenseSceneManage) {
- return R.status(fwDefenseSceneManageService.saveOrUpdate(
+ return R.status(fwDefenseSceneManageService.saveOrUpdateFwDefenseSceneManage(
GenericConverter.convert(fwDefenseSceneManage, FwDefenseSceneManageEntity.class)));
}
@@ -120,7 +120,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(fwDefenseSceneManageService.deleteLogic(Func.toLongList(ids)));
+ return R.status(fwDefenseSceneManageService.deleteFwDefenseSceneManage(Func.toLongList(ids)));
}
/**
--
Gitblit v1.9.3