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

zxl

5 天以前 1c7c1366a88bcb056a0e0bc5e0e2dfe8470b4be2

 framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java

@@ -94,7 +94,7 @@
        if (response.ok()) {
            ConnectAuthUser authUser = response.getData();
            try {
                Token token = connectService.unionLoginCallback(authUser, callback.getState());
                Token token = connectService.unionLoginCallback(authUser, callback.getState(),true);
                resultMessage = ResultUtil.data(token);
            } catch (ServiceException e) {
                throw new ServiceException(ResultCode.ERROR, e.getMessage());