Merge branch 'dev' of https://github.com/abpframework/abp into dev

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/ConventionalRouteBuilder.cs

@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
@@ -63,7 +64,7 @@ public class ConventionalRouteBuilder : IConventionalRouteBuilder, ITransientDep
             //Add secondary Id
             var secondaryIds = action.Parameters
                 .Where(p => p.ParameterName.EndsWith("Id", StringComparison.Ordinal)).ToList();
-            if (secondaryIds.Count == 1)
+            if (secondaryIds.Count == 1 && !secondaryIds[0].Attributes.Any(x => x is OptionalAttribute))
             {
                 url += $"/{{{NormalizeSecondaryIdNameCase(secondaryIds[0], configuration)}}}";
             }