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

tangxiaobao

2021-08-04 202c08e4c835e4fa00452577d954025045f7961e

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -774,4 +774,12 @@

    @GetMapping("getGridsMemberList")
    R getGridsMemberList(@RequestParam("communityId")Long communityId);

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