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

gongzuming

2024-09-26 af77899d830e854d01b48bc12db04b02116e5ea4

 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;