diff --git a/klp-ems/src/main/java/com/klp/ems/domain/vo/EmsAlarmRecordVo.java b/klp-ems/src/main/java/com/klp/ems/domain/vo/EmsAlarmRecordVo.java
index 6a0246cd..8d40d577 100644
--- a/klp-ems/src/main/java/com/klp/ems/domain/vo/EmsAlarmRecordVo.java
+++ b/klp-ems/src/main/java/com/klp/ems/domain/vo/EmsAlarmRecordVo.java
@@ -90,6 +90,7 @@ public class EmsAlarmRecordVo {
     private String remark;
 
     //联查设备名称
+    @ExcelProperty(value = "设备名称")
     private String deviceName;
     private  String deviceCode;
     private  String deviceType;
diff --git a/klp-ems/src/main/java/com/klp/ems/service/impl/EmsAlarmRecordServiceImpl.java b/klp-ems/src/main/java/com/klp/ems/service/impl/EmsAlarmRecordServiceImpl.java
index 52a9ac2d..f62f3270 100644
--- a/klp-ems/src/main/java/com/klp/ems/service/impl/EmsAlarmRecordServiceImpl.java
+++ b/klp-ems/src/main/java/com/klp/ems/service/impl/EmsAlarmRecordServiceImpl.java
@@ -73,8 +73,11 @@ public class EmsAlarmRecordServiceImpl implements IEmsAlarmRecordService {
      */
     @Override
     public List<EmsAlarmRecordVo> queryList(EmsAlarmRecordBo bo) {
-        LambdaQueryWrapper<EmsAlarmRecord> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        QueryWrapper<EmsAlarmRecord> lqw = buildQueryWrapperPlus(bo);
+        Page<Object> build = new PageQuery().build();
+        build.setSize(Long.MAX_VALUE);
+        Page<EmsAlarmRecordVo> emsAlarmRecordVoPage = baseMapper.selectVoPagePlus(build, lqw);
+        return emsAlarmRecordVoPage.getRecords();
     }
 
     private LambdaQueryWrapper<EmsAlarmRecord> buildQueryWrapper(EmsAlarmRecordBo bo) {
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java
index 5aa028d7..2ce06c0f 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java
@@ -94,7 +94,10 @@ public class WmsOrderServiceImpl implements IWmsOrderService {
     @Override
     public List<WmsOrderVo> queryList(WmsOrderBo bo) {
         LambdaQueryWrapper<WmsOrder> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        Page<Object> build = new PageQuery().build();
+        build.setSize(Long.MAX_VALUE);
+        Page<WmsOrderVo> wmsOrderVoPage = baseMapper.selectVoPlusPage(build, lqw);
+        return wmsOrderVoPage.getRecords();
     }
 
     private LambdaQueryWrapper<WmsOrder> buildQueryWrapper(WmsOrderBo bo) {