Commit 7669331e authored by lcl's avatar lcl

u

parent e3b8bfa1
......@@ -5,17 +5,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsk.cscec.domain.DSubcontract;
<<<<<<< .mine
import com.dsk.cscec.domain.vo.DCustomerListVo;
=======
import com.dsk.cscec.domain.bo.CustomerCooperationBo;
import com.dsk.cscec.domain.vo.CustomerCooperationVo;
import org.apache.ibatis.annotations.Param;
>>>>>>> .theirs
import java.util.Map;
/**
* 分包分供合同(DSubcontract)表数据库访问层
......@@ -38,23 +31,5 @@ public interface DSubcontractMapper extends BaseMapper<DSubcontract> {
* @return
*/
Page<CustomerCooperationVo> selectCooperationList(IPage<CustomerCooperationBo> build, @Param("bo")CustomerCooperationBo bo);
<<<<<<< .mine
DCustomerListVo selectStatisticByCustomerId(String customerId);
=======
/**
* 供应商合作记录
* @param build
* @param bo
* @return
*/
Page<CustomerCooperationVo> selectCooperationList(IPage<CustomerCooperationBo> build, @Param("bo")CustomerCooperationBo bo);
>>>>>>> .theirs
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment