diff --git a/storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceCamerBind.java b/storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceCamerBind.java
index 50100e1..156b35d 100644
--- a/storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceCamerBind.java
+++ b/storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceCamerBind.java
@@ -40,6 +40,10 @@ public class DeviceCamerBind extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "设备名称")
     private String deviceName;
 
+    @Column(name = "camera_name")
+    @ApiModelProperty(value = "摄像头名称")
+    private String cameraName;
+
     @Column(name = "camera_id")
     @ApiModelProperty(value = "摄像头id")
     private String cameraId;
diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/dto/CameraInfoCrieria.java b/storeroom/src/main/java/com/storeroom/modules/device/service/dto/CameraInfoCrieria.java
index a5d4254..ac6b2c0 100644
--- a/storeroom/src/main/java/com/storeroom/modules/device/service/dto/CameraInfoCrieria.java
+++ b/storeroom/src/main/java/com/storeroom/modules/device/service/dto/CameraInfoCrieria.java
@@ -12,7 +12,7 @@ import java.util.List;
 public class CameraInfoCrieria implements Serializable {
 
     @Query
-    private String alarmEvent;
+    private String event;
 
 
     @Query(type = Query.Type.BETWEEN)
diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/CameraInfoServiceImpl.java b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/CameraInfoServiceImpl.java
index 8610faf..6395de4 100644
--- a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/CameraInfoServiceImpl.java
+++ b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/CameraInfoServiceImpl.java
@@ -37,7 +37,7 @@ public class CameraInfoServiceImpl implements CameraInfoService {
 
     @Override
     public Object queryAll(CameraInfoCrieria crieria, Pageable pageable) {
-        Page<CameraInfo> page = cameraInfoRepository.findAll((root, query, criteriaBuilder) -> QueryHelp.getPredicate(root, crieria, criteriaBuilder), pageable);
+        Page<CameraInfo> page = cameraInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, crieria, criteriaBuilder), pageable);
         return PageUtil.toPage(page);
     }