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/inspectiontask/controller/QrCodeController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java b/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java
index 3d35be5..9baaf09 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java
@@ -7,10 +7,9 @@
import com.ruoyi.inspectiontask.dto.QrCodeDto;
import com.ruoyi.inspectiontask.pojo.QrCode;
import com.ruoyi.inspectiontask.service.QrCodeService;
-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.web.bind.annotation.*;
/**
@@ -18,18 +17,18 @@
* @date : 2025/9/19 10:52
*/
@RestController
-@Api(tags = "浜岀淮鐮佺鐞�")
+@Tag(name = "浜岀淮鐮佺鐞�")
@RequestMapping("/qrCode")
+@AllArgsConstructor
public class QrCodeController extends BaseController {
- @Autowired
private QrCodeService qrCodeService;
/**
* 浜岀淮鐮佺鐞嗚〃鏌ヨ
*/
@GetMapping("/list")
- @ApiOperation("浜岀淮鐮佺鐞嗚〃鏌ヨ")
+ @Operation(summary = "浜岀淮鐮佺鐞嗚〃鏌ヨ")
public R<IPage<QrCode>> list(Page page, QrCodeDto qrCodeDto) {
IPage<QrCode> list = qrCodeService.selectQrCodeList(page, qrCodeDto);
return R.ok(list);
@@ -39,7 +38,7 @@
* 浜岀淮鐮佺鐞嗚〃鏂板淇敼
*/
@PostMapping("/addOrEditQrCode")
- @ApiOperation("浜岀淮鐮佺鐞嗚〃鏂板淇敼")
+ @Operation(summary = "浜岀淮鐮佺鐞嗚〃鏂板淇敼")
public R<Long> addOrEditQrCode(@RequestBody QrCodeDto qrCodeDto) {
return R.ok(qrCodeService.addOrEditQrCode(qrCodeDto));
}
@@ -48,7 +47,7 @@
* 浜岀淮鐮佺鐞嗚〃鍒犻櫎
*/
@DeleteMapping("/delQrCode")
- @ApiOperation("浜岀淮鐮佺鐞嗚〃鍒犻櫎")
+ @Operation(summary = "浜岀淮鐮佺鐞嗚〃鍒犻櫎")
public R remove(@RequestBody Long[] ids) {
return R.ok(qrCodeService.delByIds(ids));
}
--
Gitblit v1.9.3