修改邮箱信息和模板

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/UserServiceImpl.java

@@ -134,7 +134,7 @@ public class UserServiceImpl implements UserService {
 			}
 			optAsync.doSendWork(
 					msgLanguageChange.getParameterMapByCode(languageType, "mailAddUserPwdSubject") + "【" + basicCompany.getCompanyName() +"】", 
-					MessageFormat.format(msgLanguageChange.getParameterMapByCode(languageType, "mailAddUserPwdContent"), basicUser.getLoginName(), rawPwd, loginUrl), 
+					MessageFormat.format(msgLanguageChange.getParameterMapByCode(languageType, "mailAddUserPwdContent"), basicUser.getLoginName(),basicUser.getLoginName(), rawPwd, loginUrl),
 					basicUser.getEmail(), 
 					null);
 			
@@ -338,7 +338,7 @@ public class UserServiceImpl implements UserService {
 					}
 					optAsync.doSendWork(
 							msgLanguageChange.getParameterMapByCode(languageType, "mailResetUserPwdSubject") + "【" + basicCompany.getCompanyName() +"】", 
-							MessageFormat.format(msgLanguageChange.getParameterMapByCode(languageType, "mailAddUserPwdContent"), basicUser.getLoginName(), rawPwd, loginUrl),
+							MessageFormat.format(msgLanguageChange.getParameterMapByCode(languageType, "mailAddUserPwdContent"),basicUser.getFirstName()+" "+basicUser.getLastName(),basicUser.getLoginName(), rawPwd, loginUrl),
 							basicUser.getEmail(), 
 							null);
 				}