Merge remote-tracking branch 'origin/master'

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -439,7 +439,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 WbsExcelUtil excelUtil = new WbsExcelUtil();
                 ArrayList<Map<String, String>> result = excelUtil.readExcelToObjContract(canonicalPath);
                 //匹配对应工程类别修改对应合同段节点名称
-                return this.importSubmitWbsContractNodes(result, primaryKeyId, 1); //TODO 1=默认拼接
+                return this.importSubmitWbsContractNodes(result, primaryKeyId, isSplicingNumber);
             }
         } catch (Exception e) {
             e.printStackTrace();