Merge pull request #23826 from abpframework/auto-merge/rel-10-0/3995

Merge branch dev with rel-10.0

framework/src/Volo.Abp.Mapperly/Volo/Abp/Mapperly/MapperlyAutoObjectMappingProvider.cs

@@ -227,10 +227,15 @@ public class MapperlyAutoObjectMappingProvider : IAutoObjectMappingProvider
             return extraProperties;
         }
 
-        foreach (var property in hasExtraProperties.ExtraProperties)
+
+        if(hasExtraProperties.ExtraProperties is not null)
         {
-            extraProperties.Add(property.Key, property.Value);
+            foreach (var property in hasExtraProperties.ExtraProperties)
+            {
+                extraProperties.Add(property.Key, property.Value);
+            }
         }
+        
         return extraProperties;
     }