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

lihongji

2024-11-19 ad71a09dddf7033ba80b7277ea091205457ac1b1

 _Main/UI/MacroPlannerWebApp/Component_FormPackagingPlan/Component_pHeader.def

@@ -61,7 +61,6 @@
      BaseType: 'WebDropDownStringList'
      Properties:
      [
        InitialValue: '大连工厂'
        Label: '工厂'
        Sorting: 'none'
        Strings: '大连工厂;长春工厂'