提交 1eb901fa 作者: chenshiqiang

deal mapping conflict

上级 e573ff04
...@@ -207,7 +207,7 @@ public class KnowledgeController { ...@@ -207,7 +207,7 @@ public class KnowledgeController {
/** /**
* 下载导入模板 * 下载导入模板
*/ */
@RequestMapping(value = "/download") @RequestMapping(value = "/downloadFile")
public Result<?> download(HttpServletRequest request, HttpServletResponse response) { public Result<?> download(HttpServletRequest request, HttpServletResponse response) {
try { try {
File fileDir = ExcelExportUtil.getFileDir(); File fileDir = ExcelExportUtil.getFileDir();
...@@ -229,8 +229,7 @@ public class KnowledgeController { ...@@ -229,8 +229,7 @@ public class KnowledgeController {
*/ */
@PostMapping(value = "/export") @PostMapping(value = "/export")
public Result<?> exportCollectionXls(HttpServletRequest request, public Result<?> exportCollectionXls(HttpServletRequest request,
String newsIds, String fileIds, String newsIds, String fileIds) {
@RequestParam(name = "isAll", defaultValue = "0") String isAll) {
knowledgeService.exportExcel(newsIds); knowledgeService.exportExcel(newsIds);
knowledgeService.exportPackage(fileIds); knowledgeService.exportPackage(fileIds);
return Result.OK(true); return Result.OK(true);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论