From dc9c6c612cde7b938c6851383b9da99abab025a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:02:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java
index bb14493..df8b8e2 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java
@@ -1,7 +1,7 @@
package com.ruoyi.procurementrecord.controller;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.mapper.ProcurementExceptionRecordMapper;
import com.ruoyi.procurementrecord.pojo.ProcurementExceptionRecord;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -23,13 +23,13 @@
@PostMapping("/add")
@Transactional
- public AjaxResult add(@RequestBody ProcurementExceptionRecord procurementExceptionRecord) {
- return AjaxResult.success(procurementExceptionRecordMapper.insert(procurementExceptionRecord));
+ public R<?> add(@RequestBody ProcurementExceptionRecord procurementExceptionRecord) {
+ return R.ok(procurementExceptionRecordMapper.insert(procurementExceptionRecord));
}
@PostMapping("/update")
@Transactional
- public AjaxResult updatePro(@RequestBody ProcurementExceptionRecord procurementExceptionRecord) {
- return AjaxResult.success(procurementExceptionRecordMapper.updateById(procurementExceptionRecord));
+ public R<?> updatePro(@RequestBody ProcurementExceptionRecord procurementExceptionRecord) {
+ return R.ok(procurementExceptionRecordMapper.updateById(procurementExceptionRecord));
}
}
--
Gitblit v1.9.3