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

cloudroam

2024-12-30 b9903ead016b8b1aa68eb04b48fca3b53fdab0d3

 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;

}