Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-03 b6a7f6e41467f73f26fc7f209652e19ff26c3752

 src/main/java/com/mzl/flower/service/flower/FlowerMarkupPsService.java

@@ -67,7 +67,7 @@
    }

    public void saveMarkupSpCgBatch(FlowerMarkupPsSpCgBatchSaveDTO dto){
        List<Long> categoryIds = dto.getCategoryIds();
        List<Long> categoryIds = dto.getCategoryId();
        if(categoryIds == null || categoryIds.size() == 0){
            throw new ValidationException("分类列表不能为空");
        }