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

gongzuming

2024-09-11 a339c9b8617163ab705f64d59ef261fc7700f23f

 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;

}