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

lihongji

2024-11-13 3d65ee18d645a30e600c9b63f0daefe2fc2b1151

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuPipelineReport.def

@@ -11,9 +11,10 @@
      BaseType: 'WebMenu'
      Properties:
      [
        Description: 'Engine pipeline report'
        Image: 'DOCUMENT_CONNECTION'
        Taborder: 0
        Title: 'Engine pipeline report'
        Title: '发动机管线报表'
      ]
    }
    Component MenuMachiningPipelineReport
@@ -22,9 +23,10 @@
      BaseType: 'WebMenu'
      Properties:
      [
        Description: 'Machining pipeline report'
        Image: 'DOCUMENT_CONNECTION'
        Taborder: 1
        Title: 'Machining pipeline report'
        Title: '机加件管线报表'
      ]
    }
  ]