springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
@@ -248,25 +248,25 @@
     * @param id
     * @return
     */
//    @GetMapping("/VolunteerIntegralMerchant/queryById")
//    public R VolunteerIntegralMerchantQueryById(@RequestParam("id") String id)
//    {
//        return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryById(id);
//    }
//
//    /**
//     * 分页查询
//     * @param
//     * @return
//     */
//    @GetMapping("/VolunteerIntegralMerchant/queryList")
//    public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
//                                                @RequestParam("pageSize")  int pageSize,
//                                                @RequestParam("name")  String name,
//                                                @RequestParam("state")  String state)
//    {
//        return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state);
//    }
    @GetMapping("/VolunteerIntegralMerchant/queryById")
    public R VolunteerIntegralMerchantQueryById(@RequestParam("id") String id)
    {
        return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryById(id);
    }
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/VolunteerIntegralMerchant/queryList")
    public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
                                                @RequestParam("pageSize")  int pageSize,
                                                @RequestParam("name")  String name,
                                                @RequestParam("state")  String state)
    {
        return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state);
    }