| | |
| | | */ |
| | | @GetMapping("/queryList") |
| | | public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum, |
| | | @RequestParam("pageSize") int pageSize, |
| | | @RequestParam("name") String name, |
| | | @RequestParam("state") String state) |
| | | @RequestParam("pageSize") int pageSize, |
| | | @RequestParam(value = "name", required = false) String name, |
| | | @RequestParam(value = "state", required = false) String state) |
| | | { |
| | | Page page=new Page<VolunteerIntegralMerchant>(pageNum,pageSize); |
| | | return R.ok(merchantService.queryList(page,name,state)); |
| | |
| | | } |
| | | |
| | | @DeleteMapping("/deleteById") |
| | | public R VolunteerIntegralMerchantDeleteById(@RequestParam String id) |
| | | public R VolunteerIntegralMerchantDeleteById(@RequestParam("id") String id) |
| | | { |
| | | int num= merchantService.deleteById(id); |
| | | if(num>0) |