提交冲突

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

@@ -175,10 +175,10 @@ public interface MaterialService extends IService<Material> {
 
     /**
      * 获取商品提醒
+     * @return
      */
     MaterialWarnListVo getMaterialWarn();
 
-
     //导入表格
     BaseResponseInfo importExcelTwo(MultipartFile file, HttpServletRequest request) throws Exception;
 }