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

陶杰

2024-09-27 ae9c2b4c7f1f1577584beb5a9d31f4fa69ab47ff

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

@@ -20,4 +20,10 @@
    @ApiModelProperty(value = "标签")
    private String tags;

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

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

}