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

lihongji

2024-11-15 d2d1e174b5f85497c38ec1a02e8dc78421aa3c71

 _Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelEvent.def

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