Merge remote-tracking branch 'origin/master'

jiangping

2024-03-05 2e1ac74716f62ca5712d0187cb7d7d25ee13efe5

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

@@ -104,6 +104,6 @@

    List<Member> findListByDTO(MemberQueryDTO memberQueryDTO);

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

}