Merge branch 'master' into develop

src/utils/uploadExcelByUrl.js

@@ -5,7 +5,8 @@ window.moment = moment;
 
 const uploadExcelByUrl = (nodeType, versionId, project) => {
   const TEMPLATE_URL =
-    'https://water-service-test.oss-cn-hangzhou.aliyuncs.com/public/bom/psr1121-3.xlsx';
+    'https://water-service-test.oss-cn-hangzhou.aliyuncs.com/public/bom/psr1124.xlsx';
+    // 'https://water-service-test.oss-cn-hangzhou.aliyuncs.com/public/bom/psr1121-3.xlsx';
   // 'https://water-service-test.oss-cn-hangzhou.aliyuncs.com/public/bom/psr1010.xlsx';
   // 'https://water-service-test.oss-cn-hangzhou.aliyuncs.com/public/bom/psr1009.xlsx';
   // 'https://water-service-test.oss-cn-hangzhou.aliyuncs.com/public/bom/psr1008.xlsx';