冲突处理

src/main/java/com/jsh/erp/service/DepotHeadService.java

@@ -186,7 +186,7 @@ public interface DepotHeadService extends IService<DepotHead> {
 
     /**
      * 根据商品id查询最后一条商品订单
-     * @param mid
+     * @param mid 商品ID
      * @return
      */
     DepotHead getDepotLastByMaterialId(long mid);

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

@@ -1836,7 +1836,7 @@ public class DepotHeadServiceImpl extends ServiceImpl<DepotHeadMapper, DepotHead
     /**
      * 根据商品id获取最后一条销售订单
      * @param mid 商品id
-     * @return
+     * @return 商品信息
      */
     @Override
     public DepotHead getDepotLastByMaterialId(long mid) {