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

xiaoding721

2024-09-03 0bb0bff90498bdec6f3d954dfc0bef2dec3b28c1

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgRequirementPreprocessing.def

@@ -45,6 +45,8 @@
          Properties:
          [
            DataType: 'ArchiveExecutionStatus'
            FilterArguments: 'userName:QLibMacroPlannerWebUI::ApplicationMacroPlanner.ActionBarMacroPlanner.dhUserName'
            FixedFilter: 'object.Filter( userName )'
            Source: 'ArchiveExecutionStatus'
            Taborder: 0
            Transformation: 'RequirementImportExecutionStatus'
@@ -67,6 +69,16 @@
        Taborder: 2
      ]
    }
    Component dhUserName
    {
      #keys: '[413988.0.1522010283]'
      BaseType: 'WebDataHolder'
      Databinding: 'String*'
      Properties:
      [
        Taborder: 4
      ]
    }
  ]
  Properties:
  [