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/request/flower/FlowerMarkupPsSpQueryDTO.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpQueryDTO.java b/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpQueryDTO.java
index 9dc2b2d..0c77b88 100644
--- a/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpQueryDTO.java
+++ b/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;
+
 }

--
Gitblit v1.9.3