Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-10 d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_TIANMA_JITUAN_ContextMenuSalesFillingCapacity_MenuSalesFillingS#360.def

@@ -10,8 +10,7 @@
    Body:
    [*
      // Open view
      //ApplicationMacroPlanner.OpenView( "FillingCapacitySchemeList",ButtonSalesFillingCapacity);
      ApplicationMacroPlanner.OpenView( "FillingCapacityOrderHistorical");
      ApplicationScope.ViewManager().ResetUserViewById( "FillingCapacityOrderHistorical",true);
    *]
    GroupServerCalls: false
  }