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

cloudroam

2024-12-29 a02bed07c8281ae0fda850921eb7443393c5fb0c

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