前端提交

src/main/java/com/steerinfo/dil/controller/OmstruckOrderController.java

@@ -6,15 +6,11 @@ import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.service.IOmstruckOrderService;
-<<<<<<< HEAD
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
-=======
 import com.steerinfo.dil.util.*;
->>>>>>> dc32f9f11deeaa024573daded2507e76b3e78134
-
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;