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

lihongji

2024-11-11 a67dc2f0b8dd2803982cfa9c6ea42b77c191d22c

 _Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_bRefresh_OnClick.def

@@ -14,7 +14,10 @@
    Body:
    [*
      FinancialSalesSource::InitializeNew( MacroPlan );
      
      excelsource               := maxobject( MacroPlan, FinancialSalesSource, excelsource, excelsource.IsImport(), excelsource.UploadDateTime() );
      if( not isnull( excelsource ) ){
        excelsource.AfterImport();
      }
      table := FinancialSalesSource::InitiateSearch( MacroPlan );//selectobject( MacroPlan, FinancialSalesSource.FinancialSalesReport, table, not table.IsImport() and table.IsShow() );
      
      DataHolderTable.Data( table );