From b9903ead016b8b1aa68eb04b48fca3b53fdab0d3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 30 十二月 2024 10:42:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4

---
 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