Merge branch 'test'

src/main/java/com/fdkankan/ucenter/service/impl/LoginService.java

@@ -238,7 +238,7 @@ public class LoginService {
 
         if("1".equals(country)){
             SendMailAcceUtils.sendMail(email, SendMailAcceUtils.EN_CODE_SUBJECT, SendMailAcceUtils.EN_CODE_MSG.replace("${code}", code), null);
-        }if("2".equals(country)){
+        }else if("2".equals(country)){
             SendMailAcceUtils.sendMailUsa(email, SendMailAcceUtils.EN_CODE_SUBJECT_USA, SendMailAcceUtils.EN_CODE_MSG_USA.replace("${code}", code), null);
         }else if("33".equals(country)){
             SendMailAcceUtils.sendMail(email, SendMailAcceUtils.EN_CODE_SUBJECT, MailUtil.EN_CODE_MSG.replace("${code}", code), null);