lidongdong
2023-08-29 b6ad75c0a5caf02e6f2a4a1f35deddf339c793d5
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,