diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
index 61bf378..b0559c8 100644
--- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
@@ -42,7 +42,7 @@ public class EmsSiteConfigController extends BaseController{
     }
 
     /**
-     * 获取设备列表
+     * 获取设备列表-分页
      */
     @GetMapping("/getDeviceInfoList")
     public TableDataInfo getDeviceInfoList(@RequestParam String siteId)
@@ -60,4 +60,13 @@ public class EmsSiteConfigController extends BaseController{
     {
         return success(iEmsDeviceSettingService.getDeviceDetailInfo(deviceId));
     }
+
+    /**
+     * 获取设备列表-不分页
+     */
+    @GetMapping("/getDeviceList")
+    public AjaxResult getDeviceInfoList2(@RequestParam String siteId)
+    {
+        return success(iEmsSiteService.getAllDeviceList(siteId));
+    }
 }