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

lihongji

2024-11-13 3d65ee18d645a30e600c9b63f0daefe2fc2b1151

 _Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelEvent.def

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