diff --git a/web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java b/web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java
index 808eb18..6b815ea 100644
--- a/web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java
+++ b/web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java
@@ -4,13 +4,8 @@ import com.github.pagehelper.PageInfo;
 import com.zhehekeji.common.util.ValidatorUtil;
 import com.zhehekeji.core.pojo.Result;
 import com.zhehekeji.web.entity.CheckLog;
-import com.zhehekeji.web.entity.StockLog;
-<<<<<<< HEAD
 import com.zhehekeji.web.pojo.CheckLogOne;
 import com.zhehekeji.web.pojo.Obg;
-=======
-import com.zhehekeji.web.pojo.LocReq;
->>>>>>> d6df183a0c2207a5165c402df8fc6c0fb599b9e8
 import com.zhehekeji.web.pojo.stock.CheckLogSearch;
 import com.zhehekeji.web.pojo.stock.StockLogSearch;
 import com.zhehekeji.web.service.CheckLogService;