Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1

mitao

2025-03-10 9dbb6c26c81e94e8f969805b40b0e183bf306f83

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

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