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

hongjli

2025-01-02 ccfadb626ee9918181f935cd9ef7668a5357dacf

 _Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarUnavailableEvent.def

@@ -32,16 +32,6 @@
        Taborder: 0
      ]
    }
    Component dhCategory
    {
      #keys: '[415136.0.701811642]'
      BaseType: 'WebDataHolder'
      Databinding: 'LibCal_EventCategory'
      Properties:
      [
        Taborder: 1
      ]
    }
  ]
  Properties:
  [