提交未解决冲突的文件

amos-boot-module/amos-boot-module-biz/amos-boot-module-avic-biz/src/main/java/com/yeejoin/amos/avic/service/impl/FileFransferServiceImpl.java

@@ -9,6 +9,7 @@ import javax.activation.DataHandler;
 import javax.jws.WebService;
 import javax.mail.Multipart;
 import javax.mail.internet.MimeMultipart;
+import javax.ws.rs.HEAD;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -86,11 +87,7 @@ public class FileFransferServiceImpl implements FileFransferService {
 		String template = eMailSenderService.getEmailTemplate();
 		File file = new File(String.format("%s%s%s%s", baseDir,path.replace(":", ""), File.separator, fileName));
 		Multipart mp = new MimeMultipart();
-<<<<<<< HEAD
-		//eMailSenderService.send(userCode, userCode, template, mp);
-=======
 		eMailSenderService.send(userCode, userCode, template, mp.toString());
->>>>>>> developer
 	}
 
 	@Override