Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-08 bc9bd69850c95dacb22c7da4777a1d0470c33722

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

@@ -44,4 +44,6 @@
    List<FlowerListDTO> selectZoneFlowerList(Page page, @Param("condition") FlowerZoneQueryDTO dto);

    void updateFlowerCategoryInfo(Long category);

    List<Long> searchInvalidHistory(@Param("userId") String userId);
}