diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java
index dfc76ec..ccc7508 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java
@@ -52,7 +52,8 @@
 
         Page<AlarmRecord> page = PageFactory.defaultPage();
 //        QueryWrapper<AlarmRecord> query = new QueryWrapper<>();
-        page =  alarmRecordService.pageList(page,request);
+        List<AlarmRecord> alarmRecordList=  alarmRecordService.pageList(page,request);
+        page.setRecords(alarmRecordList);
         return ResponseData.success(super.packForBT(page));
     }
     /**

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java
index dfc76ec..ccc7508 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java
@@ -52,7 +52,8 @@
 
         Page<AlarmRecord> page = PageFactory.defaultPage();
 //        QueryWrapper<AlarmRecord> query = new QueryWrapper<>();
-        page =  alarmRecordService.pageList(page,request);
+        List<AlarmRecord> alarmRecordList=  alarmRecordService.pageList(page,request);
+        page.setRecords(alarmRecordList);
         return ResponseData.success(super.packForBT(page));
     }
     /**
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java
index 0bf85d8..42056a6 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java
@@ -5,6 +5,8 @@
 import com.casic.missiles.modular.system.model.AlarmRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 告警记录表 服务类
@@ -15,6 +17,6 @@
  */
 public interface IAlarmRecordService extends IService<AlarmRecord> {
 
-    Page<AlarmRecord>  pageList(Page<AlarmRecord> page, AlarmRecordRequest request);
+    List<AlarmRecord> pageList(Page<AlarmRecord> page, AlarmRecordRequest request);
 
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java
index dfc76ec..ccc7508 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java
@@ -52,7 +52,8 @@
 
         Page<AlarmRecord> page = PageFactory.defaultPage();
 //        QueryWrapper<AlarmRecord> query = new QueryWrapper<>();
-        page =  alarmRecordService.pageList(page,request);
+        List<AlarmRecord> alarmRecordList=  alarmRecordService.pageList(page,request);
+        page.setRecords(alarmRecordList);
         return ResponseData.success(super.packForBT(page));
     }
     /**
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java
index 0bf85d8..42056a6 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java
@@ -5,6 +5,8 @@
 import com.casic.missiles.modular.system.model.AlarmRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 告警记录表 服务类
@@ -15,6 +17,6 @@
  */
 public interface IAlarmRecordService extends IService<AlarmRecord> {
 
-    Page<AlarmRecord>  pageList(Page<AlarmRecord> page, AlarmRecordRequest request);
+    List<AlarmRecord> pageList(Page<AlarmRecord> page, AlarmRecordRequest request);
 
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java
index 1dce8d5..5ea3434 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java
@@ -12,6 +12,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 告警记录表 服务实现类
@@ -31,11 +33,12 @@
 
 
     @Override
-    public Page<AlarmRecord> pageList(Page<AlarmRecord> page, AlarmRecordRequest request) {
+    public List<AlarmRecord> pageList(Page<AlarmRecord> page, AlarmRecordRequest request) {
 
 //        ShiroUser currentUser = permissionContext.getUserService().;
         AuthUser user =permissionContext.getAuthService().getLoginUser();
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+//        this.baseMapper.pageList(page,request,dataScope);
         return null;
     }
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java
index dfc76ec..ccc7508 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java
@@ -52,7 +52,8 @@
 
         Page<AlarmRecord> page = PageFactory.defaultPage();
 //        QueryWrapper<AlarmRecord> query = new QueryWrapper<>();
-        page =  alarmRecordService.pageList(page,request);
+        List<AlarmRecord> alarmRecordList=  alarmRecordService.pageList(page,request);
+        page.setRecords(alarmRecordList);
         return ResponseData.success(super.packForBT(page));
     }
     /**
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java
index 0bf85d8..42056a6 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java
@@ -5,6 +5,8 @@
 import com.casic.missiles.modular.system.model.AlarmRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 告警记录表 服务类
@@ -15,6 +17,6 @@
  */
 public interface IAlarmRecordService extends IService<AlarmRecord> {
 
-    Page<AlarmRecord>  pageList(Page<AlarmRecord> page, AlarmRecordRequest request);
+    List<AlarmRecord> pageList(Page<AlarmRecord> page, AlarmRecordRequest request);
 
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java
index 1dce8d5..5ea3434 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java
@@ -12,6 +12,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 告警记录表 服务实现类
@@ -31,11 +33,12 @@
 
 
     @Override
-    public Page<AlarmRecord> pageList(Page<AlarmRecord> page, AlarmRecordRequest request) {
+    public List<AlarmRecord> pageList(Page<AlarmRecord> page, AlarmRecordRequest request) {
 
 //        ShiroUser currentUser = permissionContext.getUserService().;
         AuthUser user =permissionContext.getAuthService().getLoginUser();
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+//        this.baseMapper.pageList(page,request,dataScope);
         return null;
     }
 }
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 14e5aa4..ae40a12 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -110,6 +110,11 @@
             <artifactId>casic-data</artifactId>
             <version>${pro.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-common</artifactId>
+            <version>${pro.version}</version>
+        </dependency>
         <!--spring boot依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>