fix: 冲突

cloudroam

2024-10-23 8c469898c0a71224e17780696d47581de47c9ed7

 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;

}