Merge branch 'clh'

LAPTOP-SNT8I5JK\Boounion

2025-06-09 3404823d074a08b8c0824b505db16168f7e66201

 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)