修改核销报错

lidongdong

2023-08-29 2f07df24db44a6ae121ee68f855c6a63b372d8ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java

@@ -17,13 +17,21 @@
    @Resource
    private VolunteerMerchantService vtService;



    @GetMapping("/getById")
    public R volunteerMerchantGetById(@RequestParam("id") String id)
    {
        return vtService.getById(id);
    }

    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/getList")
    public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
    public R volunteerMerchantGetList( int pageNum,
                                      @RequestParam("pageSize") int pageSize,
                                      @RequestParam(value = "merchantState", required = false) String merchantState,
                                      @RequestParam(value = "merchantType", required = false) String merchantType,
@@ -61,10 +69,10 @@

    @GetMapping("/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)
    {
        return R.ok(vtService.getUser(communityId,userName,userPhone));
        return vtService.getUser(communityId,userName,userPhone);
    }