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

lihongji

2024-10-12 f1de76007e7834e17d87712e3342efd84876c200

 _Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Component_pHeader.def

@@ -21,7 +21,7 @@
      BaseType: 'WebButton'
      Properties:
      [
        Label: 'Maximum quantity'
        Label: 'Maximum unpackaged quantity'
        Taborder: 1
      ]
    }
@@ -61,6 +61,7 @@
      BaseType: 'WebDropDownStringList'
      Properties:
      [
        InitialValue: '大连工厂'
        Label: '工厂'
        Sorting: 'none'
        Strings: '大连工厂;长春工厂'