From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/sales/controller/CommonFileController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/CommonFileController.java b/src/main/java/com/ruoyi/sales/controller/CommonFileController.java
index c97a55a..37266a8 100644
--- a/src/main/java/com/ruoyi/sales/controller/CommonFileController.java
+++ b/src/main/java/com/ruoyi/sales/controller/CommonFileController.java
@@ -3,7 +3,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.service.ICommonFileService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -26,12 +26,11 @@
*/
@Log(title = "闄勪欢鍒犻櫎", businessType = BusinessType.DELETE)
@DeleteMapping("/delCommonFile")
- public R<?> delCommonFile(@RequestBody Long[] ids) {
+ public AjaxResult delCommonFile(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
- return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- commonFileService.delCommonFileByIds(ids);
- return R.ok();
+ return toAjax(commonFileService.delCommonFileByIds(ids));
}
public void migrateTempFilesToFormal(Long businessId, List<String> tempFileIds) throws IOException{
--
Gitblit v1.9.3