Merge branch 'master_huangjunjie' of http://121.40.253.172:3000/pengyue/jsh_erp

# Conflicts:
#	src/main/java/com/jsh/erp/service/MaterialService.java

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

@@ -4,6 +4,7 @@ package com.jsh.erp.service;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.datasource.entities.*;
+import com.jsh.erp.datasource.vo.MaterialWarnListVo;
 import com.jsh.erp.utils.BaseResponseInfo;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -167,4 +168,12 @@ public interface MaterialService {
 
     List<MaterialVo4Unit> getMaterialBySystemSku(List<String> systemSkuList);
 
+    /**
+     * 获取商品提醒
+     * @return
+     */
+    MaterialWarnListVo getMaterialWarn();
+
+    //导入表格
+    BaseResponseInfo importExcelTwo(MultipartFile file, HttpServletRequest request) throws Exception;
 }