Merge remote-tracking branch 'origin/master'

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutioncontroller/APPComprehensiveTPreventionOrganizationController.java

@@ -37,6 +37,10 @@ public class APPComprehensiveTPreventionOrganizationController {
             return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
         }
     }
+    @GetMapping("/preventionOrganization/getComprehensiveTPreventionOrganization")
+    public AjaxResult getComprehensiveTPreventionOrganization() {
+        return AjaxResult.success(comprehensiveTPreventionOrganizationService.getComprehensiveTPreventionOrganization());
+    }
     /**
      * 获取群防群治组织详细信息
      */

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutioncontroller/AppInstitutionsController.java

@@ -12,6 +12,8 @@ import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstituti
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -42,6 +44,11 @@ public class AppInstitutionsController extends BaseController {
             return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
         }
     }
+    @GetMapping("/comprehensiveInstitutionsf/comprehensiveInstitutionsfList")
+    public AjaxResult selectComprehensiveInstitutionsf(ComprehensiveInstitutions comprehensiveInstitutions) {
+        List<ComprehensiveInstitutions> comprehensiveInstitutionsList = remoteInstitutionsService.comprehensiveInstitutionsfList();
+        return AjaxResult.success(comprehensiveInstitutionsList);
+    }
 
 
     /**