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

lihongji

2024-10-15 224bc6082b06f53755ee7e834d78e17f51cb0fa2

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgRequirementPreprocessing_deRequirementImportExecuti.def

@@ -9,7 +9,7 @@
  {
    Body:
    [*
      this.FixedFilter( "object.Filter( '" + ApplicationMacroPlanner.GetUserName() + "' )" );
      //this.FixedFilter( "object.Filter( '" + ApplicationMacroPlanner.GetUserName() + "' )" );
    *]
    GroupServerCalls: false
  }