From ae40432d02f5a698994c0b0847ef1b3f3f31451b Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期二, 08 十月 2024 17:13:27 +0800
Subject: [PATCH] Merge branch 'master-v3' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v3

---
 src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupSpQueryDTO.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupSpQueryDTO.java b/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupSpQueryDTO.java
index 0a3c057..725af56 100644
--- a/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupSpQueryDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupSpQueryDTO.java
@@ -20,4 +20,10 @@
     @ApiModelProperty(value = "合伙人ID")
     private Long partnerId;
 
+    @ApiModelProperty(value = "是否加价")
+    private String isFee;
+
+    @ApiModelProperty(value = "供应商")
+    private String supplierName;
+
 }

--
Gitblit v1.9.3