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

gongzuming

2024-09-26 e468d0b56e1c33f047bee84ca8c9a142c769fe16

 src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupSpQueryDTO.java

@@ -20,4 +20,10 @@
    @ApiModelProperty(value = "合伙人ID")
    private Long partnerId;

    @ApiModelProperty(value = "是否加价")
    private String isFee;

    @ApiModelProperty(value = "供应商")
    private String supplierName;

}