Merge remote-tracking branch 'origin/master_tuzuo' into master_tuzuo

src/main/java/com/sooka/sponest/data/emergency/appmin/index/controller/AppIndexController.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.data.emergency.appmin.index.controller;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.sooka.sponest.data.emergency.appmin.index.domain.AppIndexVO;
 import com.sooka.sponest.data.emergency.appmin.index.service.AppIndexService;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -19,11 +20,9 @@ public class AppIndexController {
     public AjaxResult getIndexPageData(AppIndexVO vo){
         return appIndexService.getIndexPageData(vo);
     }
-    @RequestMapping("getLateInspectionList")
+    @GetMapping("getLateInspectionList")
     public AjaxResult getLateInspectionList(AppIndexVO vo){
         return appIndexService.getLateInspectionList(vo);
     }
 
-
-
 }

src/main/java/com/sooka/sponest/data/emergency/appmin/team/controller/AppTeamController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.sooka.sponest.data.emergency.appmin.team.domain.AppTeamVO;
 import com.sooka.sponest.data.emergency.appmin.team.service.AppTeamService;
+import com.sooka.sponest.data.emergency.domain.TBusPatrolstation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -23,8 +24,9 @@ public class AppTeamController extends BaseController {
     @GetMapping("getTeamList")
     public AjaxResult getTeamList(AppTeamVO vo){
         try{
-            List list =  appTeamService.getTeamList(vo);
-            return AjaxResult.success(list);
+            startPage();
+            List list = appTeamService.getTeamList(vo);
+            return AjaxResult.success(getDataTable(list).getRows());
         }catch (Exception e){
             e.printStackTrace();
             return AjaxResult.error("查询错误");