From 8b0fdfd069333f412e6a7cd73bf68cebec66f4ed Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 12 Apr 2021 15:52:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java b/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
index dbe1b57..c9d1342 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
@@ -93,13 +93,13 @@
@ApiOperation(value = "������������������", notes = "������������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "current", value = "������", required = true, paramType = "query", dataType = "int"),
- @ApiImplicitParam(name = "size", value = "������������", required = true, paramType = "query", dataType = "int")
+ /*@ApiImplicitParam(name = "current", value = "������", required = true, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "size", value = "������������", required = true, paramType = "query", dataType = "int")*/
})
@RequestMapping(value = "getAllManageMenu", method = RequestMethod.GET)
public ResultMessage getAllManageMenu(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- Map<String,Object> resultMap = new HashMap<>();
+ /*Map<String,Object> resultMap = new HashMap<>();
if (parameters.get("current") == null || parameters.get("size") == null){
resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -109,8 +109,8 @@
resultMap.put("code",ResponseCodeEnum.PARAMETERS_NOT_REQUIREMENT.getCode());
resultMap.put("msg",ResponseCodeEnum.PARAMETERS_NOT_REQUIREMENT.getMsg());
return ResultMessage.fail(resultMap);
- }
- List<ManageMenu> result = manageMenuService.getAllWithPagingQuery(parameters);
+ }*/
+ List<ManageMenu> result = manageMenuService.getAllMenus();
return ResultMessage.ok(result);
}
--
Gitblit v1.8.0