From 272188e47087a8ef92eb0a48b122fa1c73ea94d3 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 24 九月 2024 00:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/dto/response/flower/FlowerShowDTO.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/response/flower/FlowerShowDTO.java b/src/main/java/com/mzl/flower/dto/response/flower/FlowerShowDTO.java
index 76ace54..9eeced2 100644
--- a/src/main/java/com/mzl/flower/dto/response/flower/FlowerShowDTO.java
+++ b/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;
 }

--
Gitblit v1.9.3