From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/account/controller/AccountFileController.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountFileController.java b/src/main/java/com/ruoyi/account/controller/AccountFileController.java
index 130e7c8..4427a3f 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountFileController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountFileController.java
@@ -3,15 +3,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.pojo.AccountFile;
import com.ruoyi.account.service.AccountFileService;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.quality.pojo.QualityInspectFile;
-import com.ruoyi.quality.service.IQualityInspectFileService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.List;
/**
@@ -19,8 +18,8 @@
*/
@RestController
@RequestMapping("/account/accountFile")
-@Api(tags = "璐㈠姟闄勪欢")
-public class AccountFileController {
+@Tag(name = "璐㈠姟闄勪欢")
+public class AccountFileController extends BaseController {
@Resource
@@ -33,9 +32,9 @@
* @return
*/
@PostMapping("/add")
- @ApiOperation("鏂板")
- public AjaxResult add(@RequestBody AccountFile accountFile) {
- return AjaxResult.success(accountFileService.save(accountFile));
+ @Operation(summary = "鏂板")
+ public R<?> add(@RequestBody AccountFile accountFile) {
+ return R.ok(accountFileService.save(accountFile));
}
/**
@@ -44,13 +43,13 @@
* @return
*/
@DeleteMapping("/del")
- @ApiOperation("鍒犻櫎")
- public AjaxResult delAccountFile(@RequestBody List<Integer> ids) {
+ @Operation(summary = "鍒犻櫎")
+ public R<?> delAccountFile(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return AjaxResult.success(accountFileService.removeBatchByIds(ids));
+ return R.ok(accountFileService.removeBatchByIds(ids));
}
/**
@@ -60,9 +59,9 @@
* @return
*/
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ")
- public AjaxResult accountFileListPage(Page page, AccountFile accountFile) {
- return AjaxResult.success(accountFileService.accountFileListPage(page, accountFile));
+ @Operation(summary = "鍒嗛〉鏌ヨ")
+ public R<?> accountFileListPage(Page page, AccountFile accountFile) {
+ return R.ok(accountFileService.accountFileListPage(page, accountFile));
}
--
Gitblit v1.9.3