From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsBrandController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsBrandController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsBrandController.java
index 2a5b9a0..601d9b0 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsBrandController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsBrandController.java
@@ -3,12 +3,13 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.goods.controller.management.DTO.GoodsBrandDTO;
-import com.ruoyi.goods.controller.management.DTO.GoodsBrandQuery;
-import com.ruoyi.goods.controller.management.VO.GoodsBrandVO;
+import com.ruoyi.goods.controller.management.dto.GoodsBrandDTO;
+import com.ruoyi.goods.controller.management.dto.GoodsBrandQuery;
+import com.ruoyi.goods.controller.management.vo.GoodsBrandVO;
import com.ruoyi.goods.service.IGoodsBrandService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
@@ -31,7 +32,7 @@
@RestController
@RequestMapping("/mgt/goods-brand")
@RequiredArgsConstructor
-@Api(value = "管理后台商品品牌相关接口", tags = {"管理后台接口"})
+@Api(value = "管理后台商品品牌相关接口", tags = {"管理后台-商品品牌相关接口"})
public class MgtGoodsBrandController {
private final IGoodsBrandService goodsBrandService;
@@ -71,9 +72,10 @@
*/
@ApiOperation(value = "删除商品品牌", notes = "删除商品品牌")
@DeleteMapping("/{id}")
- public R<Void> deleteGoodsBrand(@PathVariable("id") Long id) {
+ public R<Void> deleteGoodsBrand(
+ @ApiParam(name = "id", value = "品牌id", required = true) @PathVariable("id") Long id) {
// 通过ID删除商品品牌
- goodsBrandService.removeById(id);
+ goodsBrandService.delete(id);
return R.ok();
}
--
Gitblit v1.7.1