Merge remote-tracking branch 'origin/master'

nidapeng

2024-03-14 7ad3d376d3ccb029bb8077725aa70747b0ebb2ad

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

}