Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-06 4f228194f4ad92a1207352515948adf610235658

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

@@ -42,4 +42,8 @@
    Integer getUpFlowerStock();

    List<FlowerListDTO> selectZoneFlowerList(Page page, @Param("condition") FlowerZoneQueryDTO dto);

    void updateFlowerCategoryInfo(Long category);

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