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

cloudroam

2024-10-23 b4aa242d1b818a8ad3a285166caedb699bbcb460

 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;

}