From dbd7fd484b5c7ed00cb895f227645848c3677c08 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 11:21:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
index f5c4428..e092741 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
@@ -14,8 +14,8 @@
import com.ruoyi.measuringinstrumentledger.service.MeasuringInstrumentLedgerService;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
-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 jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
@@ -30,7 +30,7 @@
* @date : 2025/8/5 9:27
*/
@RestController
-@Api(tags = "璁￠噺鍣ㄥ叿鍙拌处")
+@Tag(name = "璁￠噺鍣ㄥ叿鍙拌处")
@RequestMapping("/measuringInstrumentLedger")
@AllArgsConstructor
public class MeasuringInstrumentLedgerController extends BaseController {
@@ -41,7 +41,7 @@
@GetMapping("/listPage")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处-鍒嗛〉鏌ヨ")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鍒嗛〉鏌ヨ")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, MeasuringInstrumentLedger measuringInstrumentLedger) {
IPage<MeasuringInstrumentLedger> listPage = measuringInstrumentLedgerService.listPage(page, measuringInstrumentLedger);
@@ -50,7 +50,7 @@
@PostMapping("/add")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处-鏂板")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鏂板")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鏂板", businessType = BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) throws IOException {
@@ -62,7 +62,7 @@
}
@PostMapping("/update")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处-淇敼")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-淇敼")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-淇敼", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) {
@@ -79,7 +79,7 @@
}
@DeleteMapping("/delete")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处-鍒犻櫎")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鍒犻櫎")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鍒犻櫎", businessType = BusinessType.DELETE)
@Transactional(rollbackFor = Exception.class)
public AjaxResult delete(@RequestBody List<Long> ids) {
@@ -100,7 +100,7 @@
}
@PostMapping("/verifying")
- @ApiOperation("璁￠噺鍣ㄥ叿鍙拌处-妫�瀹�")
+ @Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-妫�瀹�")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-妫�瀹�", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
public AjaxResult verifying(@RequestBody MeasuringInstrumentLedgerDto measuringInstrumentLedger) throws IOException {
@@ -113,7 +113,7 @@
*/
@Log(title = "瀵煎嚭璁￠噺鍣ㄥ叿鍙拌处", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- @ApiOperation("瀵煎嚭璁￠噺鍣ㄥ叿鍙拌处")
+ @Operation(summary = "瀵煎嚭璁￠噺鍣ㄥ叿鍙拌处")
public void export(HttpServletResponse response) {
measuringInstrumentLedgerService.export( response);
}
--
Gitblit v1.9.3