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

lihongji

2024-11-13 3d65ee18d645a30e600c9b63f0daefe2fc2b1151

 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Component_PanelProductLine#603.def

@@ -12,6 +12,7 @@
      Properties:
      [
        Label: 'Product line'
        Sorting: 'none'
        Taborder: 0
      ]
    }