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

yypsybs

2023-09-27 56fd7e8181fa8db461333e0451cbabbf03f290f9

 _Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl

@@ -42,12 +42,13 @@
                          infinite, 
                          unitofmeasurename );
    
    Unit::CreateOrUpdate( this, 
    supplyunit := Unit::CreateOrUpdate( this, 
                          "供应商", 
                          "供应商", 
                          "天马集团", 
                          infinite, 
                          unitofmeasurename );
    supplyunit.IsSupplier(true);
    
    Unit::CreateOrUpdate( this, 
                          "整车运输",