Merge remote-tracking branch 'origin/master'

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamSubjectController.java

@@ -3,9 +3,11 @@ package com.keao.edu.user.controller;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.tenant.TenantContextHolder;
+import com.keao.edu.user.dto.ExamSubjectDto;
 import com.keao.edu.user.entity.Subject;
 import com.keao.edu.user.service.ExamSubjectService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -23,12 +25,12 @@ public class ExamSubjectController extends BaseController {
     @Autowired
     private ExamSubjectService examSubjectService;
 
-    /*@ApiOperation("获取考试项目专业")
+    @ApiOperation("获取考试项目专业")
     @ApiImplicitParam(name = "ExamId", value = "考试项目id", required = true, dataType = "Integer")
     @GetMapping(value = "/getExamSubjects")
     public HttpResponseResult<List<ExamSubjectDto>> getExamSubjects(Integer examId) {
         return succeed(examSubjectService.getExamSubjects(examId));
-    }*/
+    }
 
     @ApiOperation("获取与考级项目相关的专业")
     @GetMapping(value = "/getUnRelatedWithExamSubjects")