Merge branch 'zhc' into ppt-20260120

2 weeks ago · fcf2417662
1 changed files with 3 additions and 3 deletions
--- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/UserServiceImpl.java
+++ b/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(),basicUser.getLoginName(), rawPwd, loginUrl),
+					MessageFormat.format(msgLanguageChange.getParameterMapByCode(languageType, "mailAddUserPwdContent"),basicUser.getFirstName()+" "+basicUser.getLastName(),basicUser.getLoginName(), rawPwd, loginUrl),
 					basicUser.getEmail(),
 					null);