zuohuaijun 1 год назад
Родитель
Сommit
f684b57a7c

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs

@@ -158,7 +158,7 @@ public class SysDictTypeService : IDynamicApiController, ITransient
         var ds = await _sysDictTypeRep.AsQueryable()
             .InnerJoin<SysDictData>((u, a) => u.Id == a.DictTypeId)
             .Where((u, a) => u.IsDelete == false && a.IsDelete == false && a.Status == StatusEnum.Enable)
-            .Select((u, a) => new { TypeCode = u.Code, a.Code,a.Name,a.Value, a.Remark, a.OrderNo, a.TagType })
+            .Select((u, a) => new { TypeCode = u.Code, a.Code, a.Name, a.Value, a.Remark, a.OrderNo, a.TagType })
             .ToListAsync();
         return ds.OrderBy(u => u.OrderNo).GroupBy(u => u.TypeCode).ToDictionary(u => u.Key, u => u);
     }

+ 2 - 0
Admin.NET/Admin.NET.Core/SignatureAuth/SignatureAuthenticationHandler.cs

@@ -17,6 +17,7 @@ namespace Admin.NET.Core;
 public sealed class SignatureAuthenticationHandler : AuthenticationHandler<SignatureAuthenticationOptions>
 {
 #if NET6_0
+
     public SignatureAuthenticationHandler(IOptionsMonitor<SignatureAuthenticationOptions> options,
         ILoggerFactory logger,
         UrlEncoder encoder,
@@ -24,6 +25,7 @@ public sealed class SignatureAuthenticationHandler : AuthenticationHandler<Signa
         : base(options, logger, encoder, clock)
     {
     }
+
 #else
     public SignatureAuthenticationHandler(IOptionsMonitor<SignatureAuthenticationOptions> options,
         ILoggerFactory logger,

+ 6 - 6
Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Admin.NET.Plugin.ApprovalFlow.csproj

@@ -11,12 +11,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <Content Include="Configuration\**\*">
-		  <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		  <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-		  <PackageCopyToOutput>true</PackageCopyToOutput>
-	  </Content>
+    <Content Include="Configuration\**\*">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>