From eecf980894d2a4590415b5bf36fee3f509183fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Fri, 19 Jul 2024 15:48:19 +0800 Subject: [PATCH] no message --- .../com/zhehekeji/web/controller/CheckLogController.java | 5 ----- 1 file changed, 5 deletions(-) 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;