合并冲突

src/main/java/com/jsh/erp/service/impl/DepotHeadServiceImpl.java

@@ -1811,7 +1811,6 @@ public class DepotHeadServiceImpl extends ServiceImpl<DepotHeadMapper, DepotHead
                 ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
     }
 
-<<<<<<< HEAD
     /**
      * 根据商品id获取最后一条销售订单
      * @param mid 商品id