Merge branch 'master' into master-v2

Cui Zhi Feng

2024-08-30 e2ab3e6f3f65dee4cf4f51d8ee735738c1315af7

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