From 2f80b7085c4eabce06d3491306b75eecc275275f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 30 四月 2026 17:31:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java b/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java
index d2cee17..f597205 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java
@@ -7,8 +7,9 @@
import com.ruoyi.inspectiontask.dto.QrCodeScanRecordDto;
import com.ruoyi.inspectiontask.pojo.QrCodeScanRecord;
import com.ruoyi.inspectiontask.service.QrCodeScanRecordService;
-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.*;
@@ -17,18 +18,18 @@
* @date : 2025/9/19 10:53
*/
@RestController
-@Api(tags = "浜岀淮鐮佹壂鎻忚褰曠鐞�")
+@Tag(name = "浜岀淮鐮佹壂鎻忚褰曠鐞�")
@RequestMapping("/qrCodeScanRecord")
+@AllArgsConstructor
public class QrCodeScanRecordController extends BaseController {
- @Autowired
private QrCodeScanRecordService qrCodeScanRecordService;
/**
* 浜岀淮鐮佹壂鐮佽褰曡〃鏌ヨ
*/
@GetMapping("/list")
- @ApiOperation("浜岀淮鐮佹壂鐮佽褰曡〃鏌ヨ")
+ @Operation(summary = "浜岀淮鐮佹壂鐮佽褰曡〃鏌ヨ")
public R<IPage<QrCodeScanRecordDto>> list(Page<QrCodeScanRecord> page, QrCodeScanRecordDto qrCodeScanRecordDto) {
IPage<QrCodeScanRecordDto> list = qrCodeScanRecordService.selectQrCodeScanRecordList(page, qrCodeScanRecordDto);
return R.ok(list);
@@ -38,7 +39,7 @@
* 浜岀淮鐮佹壂鐮佽褰曡〃鏂板淇敼
*/
@PostMapping("/addOrEditQrCodeRecord")
- @ApiOperation("浜岀淮鐮佹壂鐮佽褰曡〃鏂板淇敼")
+ @Operation(summary = "浜岀淮鐮佹壂鐮佽褰曡〃鏂板淇敼")
public R addOrEditQrCodeRecord(@RequestBody QrCodeScanRecordDto qrCodeScanRecordDto) {
return R.ok(qrCodeScanRecordService.addOrEditQrCodeRecord(qrCodeScanRecordDto));
}
@@ -47,7 +48,7 @@
* 浜岀淮鐮佹壂鐮佽褰曡〃鍒犻櫎
*/
@DeleteMapping("/delSalesRecord")
- @ApiOperation("浜岀淮鐮佹壂鐮佽褰曡〃鍒犻櫎")
+ @Operation(summary = "浜岀淮鐮佹壂鐮佽褰曡〃鍒犻櫎")
public R remove(@RequestBody Long[] ids) {
return R.ok(qrCodeScanRecordService.delByIds(ids));
}
--
Gitblit v1.9.3