Merge remote-tracking branch 'origin/master-v2' into master-v2

陶杰

2024-09-27 ae9c2b4c7f1f1577584beb5a9d31f4fa69ab47ff

 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("分类列表不能为空");
        }