Merge branch 'master-auto-pay' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserAlipayBiz.java

@@ -105,7 +105,7 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
             AppUserAlipay wxAppUser = new AppUserAlipay();
             wxAppUser.setType(2);
             wxAppUser.setUserId(userId);
-            wxAppUser.setNickname(appUserDetail.getWxNickname());
+            wxAppUser.setNickname(StringUtils.isEmpty(appUserDetail.getWxNickname())?appUserDetail.getNickname():appUserDetail.getWxNickname());
             wxAppUser.setTxAlipay(appUserLogin.getWxOpenid());
             appUserAlipays.add(wxAppUser);
         }