Merge remote-tracking branch 'origin/master'

jiangping

2024-03-05 2e1ac74716f62ca5712d0187cb7d7d25ee13efe5

 server/service/src/main/java/com/doumee/service/business/MemberService.java

@@ -2,8 +2,11 @@

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.dto.MemberImport;
import com.doumee.dao.business.dto.MemberQueryDTO;
import com.doumee.dao.business.model.Member;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;

/**
@@ -88,6 +91,8 @@
     */
    PageData<Member> findPage(PageWrap<Member> pageWrap);

    PageData<Member> findPageForCompany(PageWrap<MemberQueryDTO> pageWrap);

    /**
     * 条件统计
     *
@@ -99,4 +104,6 @@

    List<Member> findListByDTO(MemberQueryDTO memberQueryDTO);

    List<MemberImport> importBatch(MultipartFile file,Integer  solutionId);

}