Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-08-04 202c08e4c835e4fa00452577d954025045f7961e

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -988,4 +988,14 @@
        return userService.getGridsMemberList(communityId);
    }

    /**
     * 根据用户id查询用户openid
     * @param userId    用户id
     * @return  openid
     */
    @GetMapping("getUserOpenId")
    public R getUserOpenId(@RequestParam("userId")Long userId) {
        return userService.getUserOpenId(userId);
    }

}