Merge branch 'zhc' into ppt-20260120

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

@@ -133,9 +133,9 @@ public class UserServiceImpl implements UserService {
 				loginUrl = webAdminLoginUrl;
 			}
 			optAsync.doSendWork(
-					msgLanguageChange.getParameterMapByCode(languageType, "mailAddUserPwdSubject") + "【" + basicCompany.getCompanyName() +"】", 
+					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(), 
+					basicUser.getEmail(),
 					null);
 			
             return SimpleDataResponse.success();