From 824edc826c92312c150a2f0eea9bdd2bfcb82b2f Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 29 八月 2024 14:28:37 +0800
Subject: [PATCH] 冲突

---
 src/main/resources/mapper/flower/FlowerMapper.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/flower/FlowerMapper.xml b/src/main/resources/mapper/flower/FlowerMapper.xml
index 0c499bd..3ebf9f8 100644
--- a/src/main/resources/mapper/flower/FlowerMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMapper.xml
@@ -373,4 +373,10 @@
         </if>
         ORDER BY fzp.rank asc
     </select>
+
+    <update id="updateFlowerCategoryInfo">
+        update t_flower f, t_flower_category fc
+        set f.unit = fc.unit, f.color = fc.color
+        where f.category = fc.id and fc.id = #{category}
+    </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3