Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-03 b6a7f6e41467f73f26fc7f209652e19ff26c3752

 src/main/java/com/mzl/flower/web/flower/FlowerMarkupPsController.java

@@ -49,6 +49,13 @@
        return returnData(R.SUCCESS.getCode(), null);
    }

    @PostMapping("/spcg/list/save/batch")
    @ApiOperation(value = "批量新增商品分类加价")
    public ResponseEntity<ReturnDataDTO> saveMarkupSpCgBatch(@RequestBody FlowerMarkupPsSpCgBatchSaveDTO dto) {
        psService.saveMarkupSpCgBatch(dto);
        return returnData(R.SUCCESS.getCode(), null);
    }

    @PostMapping("/spcg/list/save")
    @ApiOperation(value = "新增商品分类加价")
    public ResponseEntity<ReturnDataDTO> saveMarkupSpCg(@RequestBody FlowerMarkupPsSpCgSaveDTO dto) {