Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-10 d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86

 _Main/UI/MacroPlannerWebApp/Component_FormVersionOfSOP/_ROOT_Component_FormVersionOfSOP.def

@@ -62,6 +62,16 @@
        Taborder: 4
      ]
    }
    Component DataHolderVersionOfSOPCopy
    {
      #keys: '[412960.0.166861218]'
      BaseType: 'WebDataHolder'
      Databinding: 'shadow[ScenarioMP]*'
      Properties:
      [
        Taborder: 5
      ]
    }
  ]
  Properties:
  [