冲突处理

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

@@ -1636,6 +1636,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
 
     /**
      * 获取商品提醒
+     * @return
      */
     @Override
     public MaterialWarnListVo getMaterialWarn() {
@@ -1710,7 +1711,13 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
         return vo;
     }
 
-    //导入表格
+    /**
+     * 导入表格
+     * @param file
+     * @param request
+     * @return
+     * @throws Exception
+     */
     @Override
     public BaseResponseInfo importExcelTwo(MultipartFile file, HttpServletRequest request) throws Exception {
         BaseResponseInfo info = new BaseResponseInfo();