From d34a44a1ffa778c0a95027f67d56544b0faa4930 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 四月 2026 17:16:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
index 511832e..370d41d 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
@@ -9,8 +9,8 @@
import com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedgerRecord;
import com.ruoyi.measuringinstrumentledger.service.MeasuringInstrumentLedgerRecordService;
import io.jsonwebtoken.lang.Collections;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+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;
@@ -25,7 +25,7 @@
* @date : 2025/8/5 9:28
*/
@RestController
-@Api(tags = "璁￠噺鍣ㄥ叿鍙拌处璁板綍")
+@Tag(name = "璁￠噺鍣ㄥ叿鍙拌处璁板綍")
@RequestMapping("/measuringInstrumentLedgerRecord")
@AllArgsConstructor
public class MeasuringInstrumentLedgerRecordController extends BaseController {
@@ -34,7 +34,7 @@
@GetMapping("/listPage")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒嗛〉鏌ヨ")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒嗛〉鏌ヨ")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord){
IPage<MeasuringInstrumentLedgerRecord> listPage = measuringInstrumentLedgerRecordService.listPage(page, measuringInstrumentLedgerRecord);
@@ -42,7 +42,7 @@
}
@PostMapping("/update")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处璁板綍-淇敼")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-淇敼")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-淇敼", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord) throws IOException {
@@ -54,7 +54,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(Collections.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁");
@@ -64,7 +64,7 @@
/**
* 瀵煎嚭璁￠噺鍣ㄥ叿鍙拌处
*/
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处璁板綍-瀵煎嚭")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-瀵煎嚭")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-瀵煎嚭", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response) {
--
Gitblit v1.9.3