Merge branch 'dev' into dev_yy

yanyuan

2023-11-01 c673b37d38537c136cd488b8430146573975d5e3

 _Main/UI/MacroPlannerWebApp/Component_Form633/Response_PanelPRDataButton_ButtonLoad_OnClick.def

@@ -14,7 +14,7 @@
    Body:
    [*
      MacroPlan.PRData( relflush );
      PRData::FromSupplyPlanning( GlobalOTDTable, MacroPlan, "", ApplicationMacroPlanner.GetUserName() );
      PRData::FromSupplyPlanning( GlobalOTDTable, GlobalOTDSOP, MacroPlan, "", ApplicationMacroPlanner.GetUserName() );
    *]
    GroupServerCalls: false
  }