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

yypsybs

2023-09-19 ea3a3703d4d8bc81e06c477e4759366fe0301587

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_ContextMenuSalesFillingCapacity_MenuSalesFillingSchem.def

@@ -11,8 +11,7 @@
    [*
      // Open view
      //ApplicationMacroPlanner.OpenView( "FillingCapacitySchemeList",ButtonSalesFillingCapacity);
      ApplicationMacroPlanner.OpenViewAndFocusButton( "FillingCapacitySchemeList");
      //Application.OpenForm( "FormFillingScheme");
      ApplicationMacroPlanner.OpenView( "FillingCapacitySchemeList");
    *]
    GroupServerCalls: false
  }