Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringDangerousServiceImpl.java

@@ -71,7 +71,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
         zEngineeringNodeBo.setId(baseMapper.selectIdByCid(bo.getId()));
         zEngineeringNodeBo.setCivliId(bo.getId());
-        zEngineeringNodeBo.setCreateTime(new Date());
+        zEngineeringNodeBo.setCreateTime(bo.getCreateTime());
         ZEngineeringNodeBo query = izEngineeringNodeService.query(zEngineeringNodeBo);
         zEngineeringDangerousBo.setzEngineeringNodeBo(query);
         return zEngineeringDangerousBo;
@@ -179,6 +179,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
         zEngineeringNodeBo.setId(baseMapper.selectIdByCid(update.getId()));
         zEngineeringNodeBo.setCivliId(update.getId());
+        zEngineeringNodeBo.setCreateTime(update.getCreateTime());
         izEngineeringNodeService.update(zEngineeringNodeBo);
         return baseMapper.updateById(update) > 0;
     }