Merge branch 'master' into net6.0

2022-04-10 10:55:53 +08:00
parent 973c3281b2 75bcc57608
commit 66458d7ce1
24 changed files with 87 additions and 144 deletions
--- a/ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs
+++ b/ZR.Admin.WebApi/Middleware/GlobalExceptionMiddleware.cs
@@ -121,7 +121,7 @@ namespace ZR.Admin.WebApi.Middleware
            SysOperLogService.InsertOperlog(sysOperLog);
        }

-        public static Endpoint? GetEndpoint(HttpContext context)
+        public static Endpoint GetEndpoint(HttpContext context)
        {
            if (context == null)
            {