Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-07-31 8801592d280ff58beb5677a86c263f7c05c0b7c0

 _Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_cmSubscribers.def

@@ -3,20 +3,6 @@
{
  #keys: '[415136.0.666211729]'
  BaseType: 'listContextMenu'
  Children:
  [
    Component mnDelete
    {
      #keys: '[415136.0.666211730]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'DELETE'
        Taborder: 3
        Title: 'Delete'
      ]
    }
  ]
  Properties:
  [
    Taborder: 0