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

gongzuming

2024-09-11 a339c9b8617163ab705f64d59ef261fc7700f23f

 src/main/java/com/mzl/flower/mapper/flower/FlowerMapper.java

@@ -55,4 +55,6 @@
    void restoreFlowerBatch(@Param("list") List<Long> ids);

    List<Flower> getDeletdFlowByIds(@Param("list") List<Long> ids);

    void updateTypeRankNull(@Param("category") Long category, @Param("level") String level);
}