Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-02 004f3f352e6430aeba68ac44ab86e2eeb3a6c9e3

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