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

lihongji

2024-11-13 3d65ee18d645a30e600c9b63f0daefe2fc2b1151

 _Main/UI/MacroPlannerWebApp/Component_FormAssemblyOnlinePlan/Component_pHeader.def

@@ -25,13 +25,13 @@
        Taborder: 2
      ]
    }
    Component bRefresh id:bRefresh_187
    Component bGenerateReport
    {
      #keys: '[413988.0.1351403370]'
      BaseType: 'WebButton'
      Properties:
      [
        Label: 'Refresh'
        Label: 'Generate'
        Taborder: 0
      ]
    }