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

zxl

5 天以前 f3ccf81a4f203dd0d8957bab15c491cb2181e071

 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);