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

gongzuming

2024-09-20 e425e5d101e1d48e40674a2a801efb8dd060e8a5

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