diff --git a/web/src/main/java/com/leaper/web/controller/DeviceController.java b/web/src/main/java/com/leaper/web/controller/DeviceController.java
new file mode 100644
index 0000000..80285bf
--- /dev/null
+++ b/web/src/main/java/com/leaper/web/controller/DeviceController.java
@@ -0,0 +1,38 @@
+package com.leaper.web.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.leaper.common.util.ValidatorUtil;
+import com.leaper.web.entity.CheckLog;
+import com.leaper.web.pojo.stock.CheckLogSearch;
+import com.leaper.web.service.CheckLogService;
+import com.zhehekeji.core.pojo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+
+
+@Api(tags = "盘点历史")
+@RequestMapping("/device")
+@RestController
+public class DeviceController {
+
+
+    @Resource
+    private CheckLogService checkLogService;
+    @Resource
+    private ValidatorUtil validatorUtil;
+
+    @ApiOperation("盘点历史")
+    @PostMapping("")
+    public Result<PageInfo<CheckLog>> list(@RequestBody CheckLogSearch checkLogSearch){
+        return Result.success(checkLogService.list(checkLogSearch));
+    }
+
+
+}
diff --git a/web/src/main/java/com/leaper/web/mapper/CameraIOMapper.java b/web/src/main/java/com/leaper/web/mapper/CameraIOMapper.java
index ee3e9ef..71ea57a 100644
--- a/web/src/main/java/com/leaper/web/mapper/CameraIOMapper.java
+++ b/web/src/main/java/com/leaper/web/mapper/CameraIOMapper.java
@@ -11,7 +11,7 @@ public interface CameraIOMapper extends BaseMapper<CameraIO> {
 
     @Select("select t.code as code,t.name as name ,io.id ,io.aperture,io.camera_id,io.focusing,io.multiple,io.position,io.ptz_id,io.update_time\n" +
             "from camera_io_config t \n" +
-            "left join (select * from camera_io where camera_id = #{cameraId}) io on io.name = t.name order by t.id")
+            "join (select * from camera_io where camera_id = #{cameraId}) io on io.name = t.name order by t.id")
     List<CameraIO> cameraIOs (@Param("cameraId") Integer cameraId);
 
     @Select("select * from camera_io where code = #{code} and camera_id = #{cameraId}")
diff --git a/web/src/main/java/com/leaper/web/service/CameraService.java b/web/src/main/java/com/leaper/web/service/CameraService.java
index c624b17..09cc979 100644
--- a/web/src/main/java/com/leaper/web/service/CameraService.java
+++ b/web/src/main/java/com/leaper/web/service/CameraService.java
@@ -170,7 +170,6 @@ public class CameraService {
 
     /**
      * 导入IO配置
-     *
      * @param file
      * @throws IOException
      */