From dc9c6c612cde7b938c6851383b9da99abab025a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:02:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
index b4fb8fe..f9a4666 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
@@ -3,12 +3,12 @@
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.warehouse.dto.WarehouseGoodsShelvesRowcolDto;
import com.ruoyi.warehouse.pojo.WarehouseGoodsShelvesRowcol;
import com.ruoyi.warehouse.service.WarehouseGoodsShelvesRowcolService;
-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.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,19 +17,19 @@
import java.util.List;
@RestController
-@Api(tags = "鍟嗗搧璐ф灦琛屽垪")
+@Tag(name = "鍟嗗搧璐ф灦琛屽垪")
@RequestMapping("/warehouse/goodsShelvesRowcol")
@AllArgsConstructor
public class WarehouseGoodsShelvesRowcolController extends BaseController {
private WarehouseGoodsShelvesRowcolService warehouseGoodsShelvesRowcolService;
@GetMapping("/list")
- @ApiOperation("鍟嗗搧璐ф灦琛屽垪-鏌ヨ")
+ @Operation(summary = "鍟嗗搧璐ф灦琛屽垪-鏌ヨ")
@Log(title = "鍟嗗搧璐ф灦琛屽垪-鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult list(WarehouseGoodsShelvesRowcol warehouseGoodsShelvesRowcol) {
+ public R<?> list(WarehouseGoodsShelvesRowcol warehouseGoodsShelvesRowcol) {
List<WarehouseGoodsShelvesRowcolDto> list = warehouseGoodsShelvesRowcolService.getList(warehouseGoodsShelvesRowcol);
- return AjaxResult.success(list);
+ return R.ok(list);
}
}
--
Gitblit v1.9.3