Merge branch 'develop_master' into 'FOTON'

Develop master See merge request LiuChao/foton-slrs-system-rest!384
2022-01-21 13:48:42 +08:00
parent 896fcf4952 1d1beb5b89
commit 5f18bf5235
1 changed files with 2 additions and 4 deletions
@@ -340,10 +340,8 @@ public class DicTypeEORestController extends BaseController<DicTypeEO> {
    @GetMapping("/getDicTypeListCode")
    //@RequiresPermissions("sys:dicType:getDicTypeListCode")
    public ResponseMessage<Map<String, Object>> getDicTypeListCode() throws Exception {
-
-        return Result.success("1","hello");
-//        Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCode();
-//        return Result.success(dicTypeEO);
+        Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCode();
+        return Result.success(dicTypeEO);
    }

    /**