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/procurementrecord/controller/GasTankWarningController.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java b/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java
index ea214c2..135198f 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java
@@ -3,7 +3,8 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.pojo.GasTankWarning;
import com.ruoyi.procurementrecord.service.GasTankWarningService;
import jakarta.servlet.http.HttpServletResponse;
@@ -15,28 +16,28 @@
@RestController
@RequestMapping("/gasTankWarning")
@AllArgsConstructor
-public class GasTankWarningController {
+public class GasTankWarningController extends BaseController {
private GasTankWarningService gasTankWarningService;
@GetMapping("/listPage")
- public AjaxResult listPage(Page page, GasTankWarning gasTankWarning) {
- return AjaxResult.success(gasTankWarningService.listPage(page, gasTankWarning));
+ public R<?> listPage(Page page, GasTankWarning gasTankWarning) {
+ return R.ok(gasTankWarningService.listPage(page, gasTankWarning));
}
@PostMapping("/add")
- public AjaxResult add(@RequestBody GasTankWarning gasTankWarning) {
- return AjaxResult.success(gasTankWarningService.save(gasTankWarning));
+ public R<?> add(@RequestBody GasTankWarning gasTankWarning) {
+ return R.ok(gasTankWarningService.save(gasTankWarning));
}
@PostMapping("update")
- public AjaxResult update(@RequestBody GasTankWarning gasTankWarning) {
- return AjaxResult.success(gasTankWarningService.updateById(gasTankWarning));
+ public R<?> update(@RequestBody GasTankWarning gasTankWarning) {
+ return R.ok(gasTankWarningService.updateById(gasTankWarning));
}
@DeleteMapping("delete")
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(gasTankWarningService.removeByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(gasTankWarningService.removeByIds(ids));
}
//瀵煎嚭
--
Gitblit v1.9.3