Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-03 b6a7f6e41467f73f26fc7f209652e19ff26c3752

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

@@ -14,4 +14,7 @@
public interface FlowerMarkupSpMapper extends BaseMapper<FlowerMarkupSp> {
    List<FlowerMarkupSpListDTO> selectMarkupSpList(Page page, @Param("partnerId") Long partnerId
            , @Param("condition") FlowerMarkupSpQueryDTO dto);

    List<FlowerMarkupSpListDTO> selectMarkupSpFlowerList(Page page, @Param("partnerId") Long partnerId
            , @Param("condition") FlowerMarkupSpQueryDTO dto);
}