Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

xiaoding721

2024-08-21 37d5e499ff0d2aa0d4d3d7a4c6ec65ec2ffd1d70

 _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:
  [