springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -11620,8 +11620,8 @@ @GetMapping("/VolunteerMerchant/getUser") public R volunteerMerchantGetUser(@RequestParam("communityId") String communityId, @RequestParam("userName") String userName, @RequestParam("userPhone") String userPhone); @RequestParam(value = "userName", required = false) String userName, @RequestParam(value = "userPhone", required = false)String userPhone); @GetMapping("/getById")