Merge branch 'lihb' of http://219.151.181.73:3000/zhuwei/bladex into test-merge

# Conflicts:
#	blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsSynchronousEViSaServiceImpl.java

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

@@ -2,6 +2,7 @@ package org.springblade.manager.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.manager.entity.*;
 import org.springblade.manager.mapper.TextdictInfoMapper;
@@ -106,7 +107,11 @@ public class WbsSynchronousEViSaServiceImpl {
         List<ElementFormulaMapping> elementFormulaMappings = elementFormulaMappingService.list(Wrappers.<ElementFormulaMapping>lambdaQuery()
                 .eq(ElementFormulaMapping::getProjectId, wbsTreeSynchronousRecord.getTemplateId())
                 .in(ElementFormulaMapping::getNodeId, ids));
-        elementFormulaMappings.forEach(f -> f.setProjectId(wbsTreeSynchronousRecord.getProjectId()));
+        elementFormulaMappings.forEach(f -> {
+            f.setId(SnowFlakeUtil.getId());
+            f.setProjectId(wbsTreeSynchronousRecord.getProjectId());
+            f.setCreateTime(DateTime.now());
+        });
 
         //删除当前节点的公式
         elementFormulaMappingService.remove(Wrappers.<ElementFormulaMapping>lambdaQuery()