Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

lazhen

2024-07-26 ad5eada8f75c56b2db8103605d3d0ad2ce843c59

 _Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Component_pHeader.def

@@ -55,6 +55,18 @@
        Taborder: 4
      ]
    }
    Component ddslFactorySelection
    {
      #keys: '[413988.0.1407075301]'
      BaseType: 'WebDropDownStringList'
      Properties:
      [
        Label: '工厂'
        Sorting: 'none'
        Strings: '大连工厂;长春工厂'
        Taborder: 5
      ]
    }
  ]
  Properties:
  [