From b2174bdc2c7906b0f6fa65be7a8564e64107581f Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 25 三月 2025 14:18:18 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
basic-server/src/main/java/com/ruoyi/basic/controller/WorkShopController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/WorkShopController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/WorkShopController.java
similarity index 90%
rename from inspect-server/src/main/java/com/ruoyi/inspect/controller/WorkShopController.java
rename to basic-server/src/main/java/com/ruoyi/basic/controller/WorkShopController.java
index a4ff872..624b04b 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/WorkShopController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/WorkShopController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.controller;
+package com.ruoyi.basic.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.WorkShopDto;
@@ -42,7 +42,7 @@
@ApiOperation(value = "杞﹂棿鏂囦欢涓婁紶")
@PostMapping("/uploadFile")
- public Result uploadFile(Integer id, MultipartFile file) {
+ public Result uploadFile(Integer id, MultipartFile file)throws Exception {
return Result.success(workShopService.uploadFile(id,file));
}
@@ -55,6 +55,6 @@
@ApiOperation(value = "鍒犻櫎闄勪欢")
@DeleteMapping("/delFile")
public Result<?> delFile(Integer id) {
- return Result.success(workShopFileService.removeById(id));
+ return Result.success(workShopFileService.delFile(id));
}
}
--
Gitblit v1.9.3