Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightConvenientMerchantApi.java

@@ -87,6 +87,19 @@
        return merchantService.selectUserList(communityId,phoneOrname);
    }

    @GetMapping("/selectUserListB")
    public R selectUserListB(@RequestParam("communityId") String communityId,
                            @RequestParam("phoneOrname") String phoneOrname)
    {
        return merchantService.selectUserListB(communityId,phoneOrname);
    }


    @GetMapping("/selectUserBind")
    public R selectUserBind(@RequestParam("communityId") String communityId,
                            @RequestParam("userId") String userId)
    {
        return merchantService.selectUserBind(communityId,userId);
    }

}