Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

昨天 a966dafb8877552267a94fe8c544c5ea72cf5650

 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -257,6 +257,8 @@
        }
    
        userInfo.setShopId(shopInfo.getShopId());
        userInfo.setShopName(shopInfo.getShopName());
        userInfo.setShopNum(shopInfo.getShopNum());
        recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功",Constants.FROM_SHOP);
        return userInfo;
    }