From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/account/controller/BorrowInfoController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java b/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
index 7620c19..fd39de0 100644
--- a/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
+++ b/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
@@ -6,11 +6,11 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+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 lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -29,13 +29,13 @@
@RestController
@RequestMapping("/borrowInfo")
@AllArgsConstructor
-public class BorrowInfoController {
+public class BorrowInfoController extends BaseController {
private BorrowInfoService borrowInfoService;
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, BorrowInfo borrowInfo) {
+ public R<?> listPage(Page page, BorrowInfo borrowInfo) {
return borrowInfoService.listPage(page,borrowInfo);
}
@@ -45,7 +45,7 @@
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鏂板鍊熸淇℃伅", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody BorrowInfo borrowInfo) {
+ public R<?> add(@RequestBody BorrowInfo borrowInfo) {
return borrowInfoService.add(borrowInfo);
}
@@ -55,7 +55,7 @@
@PostMapping("/update")
@Transactional(rollbackFor = Exception.class)
@Log(title = "淇敼鍊熸淇℃伅", businessType = BusinessType.UPDATE)
- public AjaxResult updateBorrowInfo(@RequestBody BorrowInfo borrowInfo) {
+ public R<?> updateBorrowInfo(@RequestBody BorrowInfo borrowInfo) {
return borrowInfoService.updateBorrowInfo(borrowInfo);
}
@@ -66,7 +66,7 @@
@DeleteMapping("/delete")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍒犻櫎鍊熸淇℃伅", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
+ public R<?> delete(@RequestBody List<Long> ids) {
return borrowInfoService.delete(ids);
}
--
Gitblit v1.9.3