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

lihongji

2024-11-11 a67dc2f0b8dd2803982cfa9c6ea42b77c191d22c

 _Main/BL/Type_FinancialSalesRow/Method_Initialize.qbl

@@ -13,7 +13,7 @@
    cell := column.FinancialSalesCell( relnew, Value := '0' );
    
    this.FinancialSalesCell( relinsert, cell );
    if( unit <> FinancialProductionReport::GetDefaultAllUnit() and not column.IsDay() ){
    if( unit <> FinancialProductionReport::GetDefaultAllUnit() ){
      importdata := product.MacroPlan().FSImportData( relnew, Generation := product.Generation()
                                                      , MqbMlb := product.MQBMLB()
                                                      , Power := product.Power()