Merge branch 'liuyang' into clh

LAPTOP-SNT8I5JK\Boounion

2024-12-13 0677e1aaead1762fc19c16c82a02926ec6d21b8a

 SourceCode/Bond/BondEq/AlarmPopupDlg.cpp

@@ -202,7 +202,7 @@
   }

   CString strText;
   CAlarmMonitor* pAlarmMonitor = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent("警告信息");
   CAlarmMonitor* pAlarmMonitor = (CAlarmMonitor*)theApp.m_model.getBonder().GetComponent(ALARM_MONITOR);
   m_pActiveAlarm = pAlarmMonitor->getActiveAlarm();
   if (m_pActiveAlarm != nullptr) {
      m_pActiveAlarm->addRef();