Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-13 3de79cb08809a47a91d354331ab166ab7cc87dc6

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java

@@ -43,10 +43,7 @@
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation.ANONYMOUS.optional;
import static sun.plugin.util.ProgressMonitor.get;

/**
 * <p>
@@ -290,6 +287,7 @@
         appUser = appUser1;
      }else if(null == appUser){
         appUser = new AppUser();
         appUser.setAvatar(registerAccount.getAvatar());
         appUser.setName(registerAccount.getName());
         appUser.setPhone(registerAccount.getPhone());
         appUser.setWxOpenid(openid);