Merge branch 'liuyang' into clh

LAPTOP-SNT8I5JK\Boounion

2025-05-15 48d848201d91187c21d015ed54c0e5e81ceb2c66

 SourceCode/Bond/BoounionPLC/AlarmMonitor.cpp

@@ -236,11 +236,13 @@
void CAlarmMonitor::addAlarmToHistoryRecord(CAlarm* pAlarm)
{
   // 加入数据库
   /*
   AlarmManager::getInstance().addAlarm(
      std::to_string(pAlarm->getId()).c_str(),
      getAlarmText(pAlarm->getId()),
      CToolUnits::timeToString2(pAlarm->getOnTime()).c_str(),
      CToolUnits::timeToString2(pAlarm->getOffTime()).c_str());
      */
}

BOOL CAlarmMonitor::addAlarming(CAlarm* pAlarm)