| | |
| | | |
| | | |
| | | /** |
| | | * 分页查询 |
| | | * @param |
| | | * @return |
| | | */ |
| | | @GetMapping("/VolunteerIntegralMerchant/merchantQueryList") |
| | | public R MerchantQueryList(@RequestParam("pageNum") int pageNum, |
| | | @RequestParam("pageSize") int pageSize, |
| | | @RequestParam(value = "name", required = false) String name, |
| | | @RequestParam(value = "state", required = false) String state, |
| | | @RequestParam(value = "merchantId", required = false) String merchantId) |
| | | { |
| | | return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"2",merchantId); |
| | | } |
| | | |
| | | |
| | | /** |
| | | * 新增 |
| | | * @param |
| | | * @return |
| | |
| | | |
| | | /** |
| | | * 是否是商家 |
| | | * @param id |
| | | * @return |
| | | */ |
| | | @GetMapping("/VolunteerMerchant/isMerchant") |