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/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
index 370d41d..73e756b 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
@@ -5,7 +5,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.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedgerRecord;
import com.ruoyi.measuringinstrumentledger.service.MeasuringInstrumentLedgerRecordService;
import io.jsonwebtoken.lang.Collections;
@@ -36,29 +36,29 @@
@GetMapping("/listPage")
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒嗛〉鏌ヨ")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord){
+ public R<?> listPage(Page page, MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord){
IPage<MeasuringInstrumentLedgerRecord> listPage = measuringInstrumentLedgerRecordService.listPage(page, measuringInstrumentLedgerRecord);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/update")
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-淇敼")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-淇敼", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord) throws IOException {
+ public R<?> update(@RequestBody MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord) throws IOException {
boolean update = measuringInstrumentLedgerRecordService.updateMeasuringInstrumentLedgerRecord(measuringInstrumentLedgerRecord);
if (update) {
- return AjaxResult.success();
+ return R.ok();
}
- return AjaxResult.error();
+ return R.fail();
}
@DeleteMapping("/delete")
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if(Collections.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁");
- return AjaxResult.success(measuringInstrumentLedgerRecordService.removeBatchByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if(Collections.isEmpty(ids)) return R.fail("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁");
+ return R.ok(measuringInstrumentLedgerRecordService.removeBatchByIds(ids));
}
/**
--
Gitblit v1.9.3