Merge branch 'dsc' into 'develop'

测试导入

See merge request 8timerv2/8timerapiv200!179

src/main/java/cn/timer/api/controller/crm/CrmController.java

@@ -1055,14 +1055,14 @@ public class CrmController {
 		try {
 		try {
 			 time = DateUtil.format(new Date(), "yyyyMMddHHmmssSSS");
 			 time = DateUtil.format(new Date(), "yyyyMMddHHmmssSSS");
 			filePath = FileHelper.downLoadFromUrl(url, time + ".xls", realPath);
 			filePath = FileHelper.downLoadFromUrl(url, time + ".xls", realPath);
+			System.err.println(filePath);
 		} catch (IOException e) {
 		} catch (IOException e) {
 			e.printStackTrace();
 			e.printStackTrace();
 		}
 		}
-		System.err.println();
 		// 从文件中读取Excel为ExcelReader
 		// 从文件中读取Excel为ExcelReader
 		ExcelReader reader;
 		ExcelReader reader;
 		// 从流中读取Excel为ExcelReader（比如从ClassPath中读取Excel文件）
 		// 从流中读取Excel为ExcelReader（比如从ClassPath中读取Excel文件）
-		reader = ExcelUtil.getReader(ResourceUtil.getStream("crm-excel/"+time+".xls"));
+		reader = ExcelUtil.getReader(ResourceUtil.getStream("/data/"+filePath));
 		reader.addHeaderAlias("*客户名称(必填)", "clientName");
 		reader.addHeaderAlias("*客户名称(必填)", "clientName");
 		reader.addHeaderAlias("*所属分组(必填)", "belongGroupName");
 		reader.addHeaderAlias("*所属分组(必填)", "belongGroupName");
 		reader.addHeaderAlias("行业", "industryName");
 		reader.addHeaderAlias("行业", "industryName");