From 400ea0152c45ec2717c98d24759cc92c28e886b0 Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Mon, 11 Mar 2024 11:47:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4-=E8=AE=B0=E5=BD=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeviceUploadLog/Response/DeviceUploadLogResponse.cs      | 5 +++++
 .../Services/Implements/DeviceUploadLogService.cs            | 1 +
 2 files changed, 6 insertions(+)

diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs
index 47c6039d..d3955ba0 100644
--- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs
+++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Response/DeviceUploadLogResponse.cs
@@ -11,6 +11,11 @@ public class DeviceUploadLogResponse
     /// </summary>
     public string DeviceUniqueNo { get; set; }
 
+    /// <summary>
+    /// 设备名称
+    /// </summary>
+    public string DeviceName { get; set; }
+
     /// <summary>
     /// 用户档案号
     /// </summary>
diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
index 015f773c..55fe6498 100644
--- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
+++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
@@ -38,6 +38,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService
             .Select((deviceUp, device, ga) => new DeviceUploadLogResponse
             {
                 OriginUserUniqueNo = deviceUp.UserUniqueNo,
+                DeviceName = device.Supplier,
                 DeviceUniqueNo = deviceUp.DeviceUniqueNo,
                 Id = deviceUp.Id,
                 RaiseDateTime = deviceUp.RaiseDateTime,