Merge branch 'dev_cr' into dev

zhuo

2025-03-10 ac9ba01f811d9755204a82bd7bd9a444139711fd

 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));
    }