From f27bfd01251ea5ff742f0ad175b88c0c16bd5c8c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 06 九月 2024 11:58:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpCgBatchSaveDTO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpCgBatchSaveDTO.java b/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpCgBatchSaveDTO.java
index 521b82c..747a186 100644
--- a/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpCgBatchSaveDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpCgBatchSaveDTO.java
@@ -12,7 +12,7 @@
     private Long partnerId;
 
     @ApiModelProperty(value = "分类id列表")
-    private List<Long> categoryIds;
+    private List<Long> categoryId;
 
     @ApiModelProperty(value = "A级金额")
     private BigDecimal levelA;

--
Gitblit v1.9.3