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

lihongji

2024-12-03 77dc40157d7ebff272f55055708cc8d2a1ae71ce

 _Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelEvent.def

@@ -54,7 +54,6 @@
      ]
      Properties:
      [
        AllowEmpty: true
        DisplayField: 'Name'
        Label: '事件类型'
        NumberOfColumns: 15