springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
@@ -193,7 +193,7 @@
     * @param
     * @return
     */
    @GetMapping("/IntegralRecord/getId")
    @GetMapping("/IntegralRecord/getList")
    public R VolunteerIntegralRecordGetList(@RequestParam("pageNum") int pageNum,
                                            @RequestParam("pageSize")  int pageSize,
                                            @RequestParam("userId") String userId)
@@ -235,6 +235,39 @@
        return volunteerActivitiesPeople.VolunteerIntegralRecordDeleteId(id);
    }
    /****************************************************************************************************
     *
     *
     *                路北积分商城
     *
     *
     ***************************************************************************************************/
    /**
     * 获取单个详情
     * @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);
    }
}