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

peng

8 天以前 134f5b1aedeb90b9f7a71dc41e8f08e96bcb3f85

 buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java

@@ -79,7 +79,7 @@
    @PostMapping("/app/login")
    public ResultMessage<Token> unionLogin(@RequestBody ConnectAuthUser authUser, @RequestHeader("uuid") String uuid) {
        try {
            return ResultUtil.data(connectService.unionLoginCallback(authUser, uuid));
            return ResultUtil.data(connectService.unionLoginCallback(authUser, uuid,true));
        } catch (Exception e) {
            e.printStackTrace();
            log.error("unionID登录错误", e);