Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-03 b6a7f6e41467f73f26fc7f209652e19ff26c3752

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

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

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

    void updateFlowerCategoryInfo(Long category);
}