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

陶杰

2024-12-06 984c102eb4e632985e45b7c4be1545c53c87b589

 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;