Commit d54b248f by shenjunjie

Merge branch 'release' into 'master'

Release

See merge request !495
parents 6dd6609f 6a74474e
...@@ -259,7 +259,7 @@ public class AppArticleController extends BaseController { ...@@ -259,7 +259,7 @@ public class AppArticleController extends BaseController {
@ApiOperation("舆情简报-全部报告列表") @ApiOperation("舆情简报-全部报告列表")
@GetMapping("/report/list") @GetMapping("/report/list")
@LogRecord(description = "舆情库-舆情简报") @LogRecord(description = "舆情库-其他简报")
public ResponseResult findReportList(ReportSearchDTO reportSearch) { public ResponseResult findReportList(ReportSearchDTO reportSearch) {
return ResponseResult.success(reportService.findReportList(reportSearch)); return ResponseResult.success(reportService.findReportList(reportSearch));
} }
...@@ -540,6 +540,7 @@ public class AppArticleController extends BaseController { ...@@ -540,6 +540,7 @@ public class AppArticleController extends BaseController {
@ApiOperation("舆情简报-每日一报列表") @ApiOperation("舆情简报-每日一报列表")
@GetMapping("/daily-report/list") @GetMapping("/daily-report/list")
@LogRecord(description = "舆情简报-每日一报")
public ResponseResult getDailyReportList(@RequestParam(value = "page", defaultValue = "1") Integer page, public ResponseResult getDailyReportList(@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize) { @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize) {
return ResponseResult.success(markDataService.getDailyReportList(page, pageSize)); return ResponseResult.success(markDataService.getDailyReportList(page, pageSize));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment