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

gongzuming

2024-08-30 84f1e606d3cdd3733b0e92927bd46bf60ad93063

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