From 7558c9d88fd8acfea2201286063f7c9a40b1101d Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Thu, 4 Jun 2020 11:34:45 +0800
Subject: [PATCH] 1.0.0.604
Former-commit-id: 05ffebb2a8e760774071a34c50324ad1d2036736
---
projects/IoTCenter/Api/NodeController.cs | 2 +-
projects/UserCenter/UserCenter.csproj | 2 ++
projects/Version.cs | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/projects/IoTCenter/Api/NodeController.cs b/projects/IoTCenter/Api/NodeController.cs
index d3ef86f3..bd87a5aa 100644
--- a/projects/IoTCenter/Api/NodeController.cs
+++ b/projects/IoTCenter/Api/NodeController.cs
@@ -62,7 +62,7 @@ namespace IoTCenter.Api.Controllers
o.Image,
o.DisplayOrder,
Count = _deviceRepo.ReadOnlyTable().Count(d => d.NodeId == o.Id),
- Template = _nodeCategoryNodeRepo.ReadOnlyTable().FirstOrDefault(o => o.NodeId == o.Id)?.Category.Template
+ Category = _nodeCategoryNodeRepo.ReadOnlyTable().Include(ncn => ncn.Category).FirstOrDefault(ncn => ncn.NodeId == o.Id)?.Category
});
return Ok(model);
}
diff --git a/projects/UserCenter/UserCenter.csproj b/projects/UserCenter/UserCenter.csproj
index 538075eb..a482a70e 100644
--- a/projects/UserCenter/UserCenter.csproj
+++ b/projects/UserCenter/UserCenter.csproj
@@ -5,6 +5,7 @@
true
false
false
+ Linux
@@ -12,6 +13,7 @@
+
diff --git a/projects/Version.cs b/projects/Version.cs
index 5f0bb916..8c2e695f 100644
--- a/projects/Version.cs
+++ b/projects/Version.cs
@@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0.603")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("1.0.0.604")]
\ No newline at end of file