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

huliguo

昨天 a966dafb8877552267a94fe8c544c5ea72cf5650

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java

@@ -135,6 +135,8 @@
        // 接口返回信息
        OauthUserVo oauthUserVo = new OauthUserVo();
        oauthUserVo.setShopId(qwH5LoginVo.getShopId());
        oauthUserVo.setShopNum(qwH5LoginVo.getShopNum());
        oauthUserVo.setShopName(qwH5LoginVo.getShopName());
        oauthUserVo.setToken(JwtUtils.createToken(claimsMap));
        oauthUserVo.setExpiresIn(EXPIRE_TIME);
        oauthUserVo.setUserid(qwH5LoginVo.getUserid());