diff --git a/Src/Dlhis.Basic/Device/Response/DeviceUnderGroupResponse.cs b/Src/Dlhis.Basic/Device/Response/DeviceUnderGroupResponse.cs
index 1edfa8a4..d5687c61 100644
--- a/Src/Dlhis.Basic/Device/Response/DeviceUnderGroupResponse.cs
+++ b/Src/Dlhis.Basic/Device/Response/DeviceUnderGroupResponse.cs
@@ -19,13 +19,23 @@ public class DeviceUnderGroupResponse
///
public string Brand { get; set; }
+ ///
+ /// 部署点
+ ///
+ public string DeployPlace { get; set; }
+
+ ///
+ /// 连接信息
+ ///
+ public string ConnectionInfo { get; set; }
+
///
/// 设备类型
///
public DeviceTypeEnumType Type { get; set; }
-
+
///
/// 是否启用
///
public bool Enable { get; set; }
-}
+}
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceGroupService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceGroupService.cs
index 673595f4..d4bd5f66 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceGroupService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceGroupService.cs
@@ -138,7 +138,9 @@ public class DeviceGroupService : IDeviceGroupService
Type = x.Type,
Code = x.Code,
Enable = x.Enable,
- Brand = dt.Brand
+ Brand = dt.Brand,
+ DeployPlace = x.DeployPlace,
+ ConnectionInfo = x.ConnectionInfo,
})
.ToListAsync();
}
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs
index d7c4a362..f0d5a9bf 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs
@@ -28,8 +28,10 @@ public class DeviceTaskAssignmentRequest : PageDto, IValidatableObject
///
/// 厂区
///
+ [Required(ErrorMessage = "厂区不可为空")]
public string Factory { get; set; }
+
///
/// 搜索范围
///