From d94e7d6bbf23698c27147a60ee866c64b2d43775 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 14 十一月 2024 09:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml b/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
index cf640fa..50062c8 100644
--- a/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
@@ -16,7 +16,7 @@
join t_flower_markup_sp sp on sp.flower_id = f.id and sp.partner_id = #{partnerId}
left join t_supplier_info s on s.id = f.supplier_id
left join t_flower_category c on f.category = c.id
- WHERE f.deleted = 0 AND sp.fee > 0
+ WHERE f.deleted = 0
<if test="condition.name != null and condition.name != ''">
AND f.name LIKE concat('%', #{condition.name},'%')
</if>
--
Gitblit v1.9.3