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

zss

2025-04-17 e9bf5a0070b5fbdf9afd4475adbf51e46f579040

 cnas-device/src/main/java/com/ruoyi/device/controller/DeviceExternalApplyController.java

@@ -55,7 +55,7 @@
     * @return
     */
    @ApiOperation(value = "删除利用外部设备申请")
    @GetMapping("/delDeviceExternalApply")
    @DeleteMapping("/delDeviceExternalApply")
    public Result delDeviceExternalApply(Integer externalApplyId){
        return Result.success(deviceExternalApplyService.removeById(externalApplyId));
    }