Merge branch 'develop_3' into 'develop_master'

查询字典类型接口回滚 See merge request LiuChao/foton-slrs-system-rest!383
2022-01-21 13:41:17 +08:00
parent c97e8442f4 cd8fffa2f8
commit 1d1beb5b89
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);
    }

    /**