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

gongzuming

2024-09-08 55db77e61e5a55c30dc19d599dadcfc1469c962e

 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);
}