Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

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

@@ -73,7 +73,7 @@
    @DeleteMapping("/{id}")
    public R<Void> deleteGoodsSeries(
            @ApiParam(name = "id", value = "商品香型id", required = true) @PathVariable("id") Long id) {
        goodsSeriesService.removeById(id);
        goodsSeriesService.delete(id);
        return R.ok();
    }
}