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

lihongji

2024-12-03 77dc40157d7ebff272f55055708cc8d2a1ae71ce

 _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
  }