fix 设备分页返回属性新增Type
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
using Dlhis.Entity.Device.Enums;
|
using Dlhis.Entity.Device.Enums;
|
||||||
|
using Google.Protobuf.WellKnownTypes;
|
||||||
using Kurisu.AspNetCore.Utils.Extensions;
|
using Kurisu.AspNetCore.Utils.Extensions;
|
||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
|
|
||||||
@@ -51,7 +52,9 @@ public class DevicePageResponse
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 设备机功能类型
|
/// 设备机功能类型
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string TypeDescription { get; set; }
|
public DeviceGroupFunctionEnumType Type { get; set; }
|
||||||
|
|
||||||
|
public string TypeDescription => Type.GetDescription();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 部署点
|
/// 部署点
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ public class DeviceService : IDeviceService
|
|||||||
{
|
{
|
||||||
FuncsStr = d.Funcs.ToString(),
|
FuncsStr = d.Funcs.ToString(),
|
||||||
Brand = dt.Brand,
|
Brand = dt.Brand,
|
||||||
TypeDescription = d.Type.ToString(),
|
Type = d.Type,
|
||||||
}, true)
|
}, true)
|
||||||
.ToPageListAsync(request);
|
.ToPageListAsync(request);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user