diff --git a/src/main/java/com/zhangmeng/online/exam/controller/PermissionController.java b/src/main/java/com/zhangmeng/online/exam/controller/PermissionController.java
new file mode 100644
index 0000000..068b90a
--- /dev/null
+++ b/src/main/java/com/zhangmeng/online/exam/controller/PermissionController.java
@@ -0,0 +1,42 @@
+package com.zhangmeng.online.exam.controller;
+
+import com.zhangmeng.online.exam.dao.PermissionDao;
+import com.zhangmeng.online.exam.dto.Result;
+import com.zhangmeng.online.exam.entity.Permission;
+import com.zhangmeng.online.exam.entity.Role;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zm
+ * @date 2025/3/7 9:46
+ * @version: 1.0
+ */
+@RestController
+@RequestMapping("/permission")
+public class PermissionController {
+
+    @Autowired
+    private PermissionDao permissionDao;
+
+    @RequestMapping("/list")
+    public Result list() {
+        List<Permission> list = permissionDao.findAll();
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        for (Permission permission : list) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", permission.getId());
+            map.put("name", permission.getName());
+            map.put("desc", permission.getDescription());
+            map.put("url", permission.getUrl());
+            resultList.add(map);
+        }
+        return Result.success(resultList);
+    }
+}
diff --git a/src/main/java/com/zhangmeng/online/exam/controller/QuestionController.java b/src/main/java/com/zhangmeng/online/exam/controller/QuestionController.java
new file mode 100644
index 0000000..f00775a
--- /dev/null
+++ b/src/main/java/com/zhangmeng/online/exam/controller/QuestionController.java
@@ -0,0 +1,43 @@
+package com.zhangmeng.online.exam.controller;
+
+import com.zhangmeng.online.exam.dao.QuestionDao;
+import com.zhangmeng.online.exam.dto.Result;
+import com.zhangmeng.online.exam.entity.Permission;
+import com.zhangmeng.online.exam.entity.Question;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zm
+ * @date 2025/3/7 9:49
+ * @version: 1.0
+ */
+@RestController
+@RequestMapping("/question")
+public class QuestionController {
+
+    @Autowired
+    private QuestionDao questionDao;
+
+    @RequestMapping("/list")
+    public Result list() {
+        List<Question> list = questionDao.findAll();
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        for (Question question : list) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", question.getId());
+            map.put("name", question.getName());
+            map.put("type", question.getType().getDesc());
+            map.put("subject", question.getSubject().getName());
+            resultList.add(map);
+        }
+        return Result.success(resultList);
+    }
+
+}
diff --git a/src/main/java/com/zhangmeng/online/exam/entity/Question.java b/src/main/java/com/zhangmeng/online/exam/entity/Question.java
index bbfa9e2..3748f75 100644
--- a/src/main/java/com/zhangmeng/online/exam/entity/Question.java
+++ b/src/main/java/com/zhangmeng/online/exam/entity/Question.java
@@ -24,12 +24,41 @@ import java.util.List;
 public class Question extends BaseEntity<Long> {
 
     public enum Type {
-        SINGLE_CHOICE,//单选题
-        MULTIPLE_CHOICE,//多选题
-        JUDGMENT,//判断题
-        SHORT_ANSWER,//简答题
-        TRUE_OR_FALSE,//判断题
-        NUMERICAL,//计算题
+        SINGLE_CHOICE("单选题", 0),//单选题
+        MULTIPLE_CHOICE("多选题", 1),//多选题
+        JUDGMENT("判断题", 2),//判断题
+        SHORT_ANSWER("简答题", 3),//简答题
+        TRUE_OR_FALSE("判断题",4),//判断题
+        NUMERICAL("计算题",5);//计算题
+
+        private String desc;
+
+        private int index;
+
+        Type(String desc, int index) {
+            this.desc = desc;
+            this.index = index;
+        }
+
+        Type(String desc) {
+            this.desc = desc;
+        }
+
+        public String getDesc() {
+            return desc;
+        }
+
+        public void setDesc(String desc) {
+            this.desc = desc;
+        }
+
+        public int getIndex() {
+            return index;
+        }
+
+        public void setIndex(int index) {
+            this.index = index;
+        }
     }
 
     private String name;