Merge branch 'dev' into dev_yx

yypsybs

2023-10-08 f5d6db2a9edfb82bbdb1ce5688c00df7dc101e83

 _Main/BL/Type_MacroPlan/Method_MappingSalesSegmentData.qbl

@@ -14,7 +14,10 @@
    if( isnull( businessTypes ) or businessTypes.Size() = 0 ) {
        listToDeal := selectset( globalOTDTable, Global_MappingSalesSegment_MP, item, true );
    } else {
        listToDeal := selectset( globalOTDTable, Global_MappingSalesSegment_MP, item, businessTypes.Find( item.BusinessType() ) <> -1 );
        listToDeal := selectset( globalOTDTable, 
                                 Global_MappingSalesSegment_MP, 
                                 item, 
                                 businessTypes.Find( item.BusinessType() ) <> -1 );
    }
    //nameList := construct( structured[String] );
    //nameList := selectvalues( listToDeal, Elements, item, true, item.Name() );