Merge remote-tracking branch 'origin/master' into master-v2

gongzuming

2024-08-29 e0ea1f4a21321f145be79556896181f23f22b708

 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>