Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-20 dac29f7b9fdbae6b85ec345d0895ed83cefd4434

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java

@@ -62,6 +62,6 @@
        }
        AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey,  data.getIv());
        appletUserDecodeData.setOpenId(openid);
        return AjaxResult.ok(appUserService.login(appletUserDecodeData));
        return AjaxResult.ok(appUserService.wxLogin(appletUserDecodeData));
    }
}