Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsBrandController.java

@@ -9,6 +9,7 @@
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();
    }