From 02f3e6dd0efb15726df95831727d32bd1ad3f167 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 4 Dec 2020 13:43:11 +0800
Subject: [PATCH] 1.1.1.0

Former-commit-id: 1554ef9f1c9c96cd1339bc5f74c0d02e01a2561c
Former-commit-id: 7b61c04db02668c58a50aa189f779ed16e977902
---
 .../IoT.Shared/Areas/IoTCenter/Controlls/AjaxController.cs    | 4 ++--
 projects/IoTNode/IoTNode.csproj                               | 2 +-
 projects/IoTNode/Views/Shared/_TopMenu.cshtml                 | 2 +-
 projects/Platform/Platform.csproj                             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/projects/IoT.Shared/Areas/IoTCenter/Controlls/AjaxController.cs b/projects/IoT.Shared/Areas/IoTCenter/Controlls/AjaxController.cs
index 0c59852f..f0e2b3a2 100644
--- a/projects/IoT.Shared/Areas/IoTCenter/Controlls/AjaxController.cs
+++ b/projects/IoT.Shared/Areas/IoTCenter/Controlls/AjaxController.cs
@@ -17,7 +17,7 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
     [Area("IoTCenter")]
     public class AjaxController
     {
-        private readonly ILogger _logger;
+        private readonly ILogger<AjaxController> _logger;
         private readonly IRepository<Category> _categoryRepo;
         private readonly IRepository<Organ> _organRepo;
         private readonly IRepository<OrganNode> _organNodeRepo;
@@ -31,7 +31,7 @@ namespace IoT.Shared.Areas.IoTCenter.Controlls
         private readonly IRepository<Scene> _sceneRepo;
         private readonly IRepository<SceneTigger> _sceneTiggerRepo;
 
-        public AjaxController(ILogger logger,
+        public AjaxController(ILogger<AjaxController> logger,
             IRepository<Category> categoryRepo,
             IRepository<Product> productRepo,
             IRepository<Organ> organRepo,
diff --git a/projects/IoTNode/IoTNode.csproj b/projects/IoTNode/IoTNode.csproj
index 65953a6b..fede2cc7 100644
--- a/projects/IoTNode/IoTNode.csproj
+++ b/projects/IoTNode/IoTNode.csproj
@@ -4,7 +4,7 @@
 		<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
 		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
 		<GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
-		<Version>1.1.0.12</Version>
+		<Version>1.1.1.0</Version>
 	</PropertyGroup>
 	<ItemGroup>
 		<Compile Remove="Application\Models\**" />
diff --git a/projects/IoTNode/Views/Shared/_TopMenu.cshtml b/projects/IoTNode/Views/Shared/_TopMenu.cshtml
index 3b8ceda0..565f30dd 100644
--- a/projects/IoTNode/Views/Shared/_TopMenu.cshtml
+++ b/projects/IoTNode/Views/Shared/_TopMenu.cshtml
@@ -12,6 +12,6 @@
         <a href="@Url.Action("Index","User",new { area="UserCenter"})" class="@GetLinkClass(area:"UserCenter")">组织机构</a>
     </li>
     <li class="nav-item d-none d-sm-inline-block">
-        <a href="@Url.Action("Index","Product",new { area="IoTCenter"})" class="@GetLinkClass(area:"IoTCenter")">物联网</a>
+        <a href="@Url.Action("Index","Product",new { area="IoTCenter"})" class="@GetLinkClass(area:"IoTCenter")">设备管控</a>
     </li></ul>
 </ul>
diff --git a/projects/Platform/Platform.csproj b/projects/Platform/Platform.csproj
index 16020a39..5e43781c 100644
--- a/projects/Platform/Platform.csproj
+++ b/projects/Platform/Platform.csproj
@@ -4,7 +4,7 @@
 		<SatelliteResourceLanguages>Zh-CN</SatelliteResourceLanguages>
 		<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
 		<GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
-		<Version>1.1.0.12</Version>
+		<Version>1.1.1.0</Version>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Hangfire.AspNetCore" Version="1.7.18" />