|
@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestParam;
|
20
|
20
|
import org.springframework.web.bind.annotation.RestController;
|
21
|
21
|
|
22
|
22
|
import java.util.Date;
|
|
23
|
import java.util.List;
|
23
|
24
|
import java.util.Map;
|
24
|
25
|
|
25
|
26
|
/**
|
|
@ -51,9 +52,9 @@ public class MeetingController {
|
51
|
52
|
@RequestMapping("/list")
|
52
|
53
|
@RequiresPermissions("admin:meeting:list")
|
53
|
54
|
public R list(@RequestParam Map<String, Object> params){
|
54
|
|
PageUtils page = meetingService.queryPage(params);
|
55
|
|
|
56
|
|
return R.ok().put("page", page);
|
|
55
|
// PageUtils page = meetingService.queryPage(params);
|
|
56
|
List<MeetingEntity> list = meetingService.list();
|
|
57
|
return R.ok().put("list", list);
|
57
|
58
|
}
|
58
|
59
|
|
59
|
60
|
/**
|