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

Cui Zhi Feng

2024-09-26 d9e918ae32613a04de0b979078eba278556979c5

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

@@ -23,4 +23,7 @@
    @ApiModelProperty(value = "是否加价")
    private String isFee;

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

}