From cd34c87afa730c48e2b2be61d700b1fee409e02c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 12 七月 2021 11:00:12 +0800
Subject: [PATCH] fix 修复升级合并错误
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
index 7fbd05c..a272a6e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@@ -21,7 +21,7 @@
/**
* 鏁版嵁瀛楀吀淇℃伅
- *
+ *
* @author ruoyi
*/
@RestController
@@ -38,9 +38,7 @@
@GetMapping("/list")
public TableDataInfo list(SysDictData dictData)
{
- startPage();
- List<SysDictData> list = dictDataService.selectDictDataList(dictData);
- return getDataTable(list);
+ return dictDataService.selectPageDictDataList(dictData);
}
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.EXPORT)
@@ -109,6 +107,7 @@
@DeleteMapping("/{dictCodes}")
public AjaxResult remove(@PathVariable Long[] dictCodes)
{
- return toAjax(dictDataService.deleteDictDataByIds(dictCodes));
+ dictDataService.deleteDictDataByIds(dictCodes);
+ return success();
}
}
--
Gitblit v1.9.3