Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

昨天 9f99167aba3720cb731298511f8423b18c08e5a2

 src/main/java/com/ruoyi/aftersalesservice/mapper/AfterSalesServiceMapper.java

@@ -3,8 +3,13 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.aftersalesservice.dto.AfterSalesServiceNewDto;
import com.ruoyi.aftersalesservice.dto.CountDto;
import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
import org.apache.ibatis.annotations.Param;

import java.util.HashMap;
import java.util.List;

/**
 * @author :yys
@@ -18,5 +23,7 @@
     * @param afterSalesService
     * @return
     */
    IPage<AfterSalesService> listPage(Page page,@Param("req") AfterSalesService afterSalesService);
    IPage<AfterSalesServiceNewDto> listPage(Page page, @Param("req") AfterSalesServiceNewDto afterSalesService);

    List<CountDto> countAfterSalesService();
}