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

lihongji

2024-10-15 224bc6082b06f53755ee7e834d78e17f51cb0fa2

 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_bComparison_OnClick#613.def

@@ -9,7 +9,10 @@
  {
    Body:
    [*
      opt := ddlOfflinePlanTable.Data();
      offlineTableInfo := ddlOfflinePlanTable.Data();
      macroPlan := ApplicationMacroPlanner.GetMacroPlanByMDSID( offlineTableInfo );
      opt := select( macroPlan ,NewOfflinePlanTable,table,table.SaveDateTime() = offlineTableInfo.TableSaveTime() );
      
      
      dhTable.Data( opt.Comparison( RecycleBin,Archive ));
    *]