Merge remote-tracking branch 'origin/new-exam' into new-exam

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysMeetingnumController.java

@@ -12,10 +12,8 @@ import com.ruoyi.system.service.TdMeetingService;
 import com.ruoyi.web.controller.manager.TdMeetingManager;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
 import java.time.LocalDate;
@@ -91,5 +89,15 @@ public class SysMeetingnumController extends BaseController {
         return AjaxResult.success(obj);
     }
 
+    /**
+     * 会议详情
+     */
+    @GetMapping("/detail/{id}")
+    public String view(@PathVariable("id") String id, ModelMap mmap) {
+        TdMeeting meeting = tdMeetingManager.selectTdMeeting(id);
+        mmap.put("meeting", meeting);
+        return prefix + "/detail";
+    }
+
 
 }