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

cloudroam

2024-09-04 6424048caa1ceb3fe5ad31a68fb6eec69bbed6d2

 src/main/java/com/mzl/flower/dto/response/flower/FlowerShowDTO.java

@@ -3,6 +3,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
public class FlowerShowDTO extends FlowerSupplierDTO {

@@ -29,4 +31,7 @@
    private Integer shopnum;

    private Integer realSales;//真实销量

    @ApiModelProperty(value = "会员价")
    private BigDecimal priceMember;
}