Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

2024-01-10 11:09:18 +08:00
parent 0e45532a01 76558e2f0a
commit 8fe4005ae7
43 changed files with 376 additions and 43 deletions
--- a/Src/Dlhis.ScheduledTask/Dlhis.ScheduledTask.csproj
+++ b/Src/Dlhis.ScheduledTask/Dlhis.ScheduledTask.csproj
@@ -20,8 +20,7 @@
      <PackageReference Include="Hangfire.AspNetCore" Version="1.8.7" />
      <PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
      <PackageReference Include="Hangfire.MySqlStorage" Version="2.0.3" />
-      <PackageReference Include="Kurisu.AspNetCore" Version="0.4.7" />
-      <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
+      <PackageReference Include="Kurisu.AspNetCore" Version="0.4.8" />
    </ItemGroup>

    <ItemGroup>
--- a/Src/Dlhis.ScheduledTask/Job/SyncPersonJob.cs
+++ b/Src/Dlhis.ScheduledTask/Job/SyncPersonJob.cs
@@ -165,7 +165,7 @@ namespace Dlhis.ScheduledTask.Job
                {
                   SapNo = item.ano,
                   No = item.guestno,
-                   //GType = item.@class,
+                   Type = item.@class,
                   Name = item.gname,
                   Code = item.ename,
                   CountryNo = item.country,