diff --git a/docs/演示方案.docx b/docs/演示方案.docx
index 9c1488b4..a99d404f 100644
Binary files a/docs/演示方案.docx and b/docs/演示方案.docx differ
diff --git a/docs/物联网管控平台.pptx b/docs/物联网管控平台.pptx
index af1e9e70..21896423 100644
Binary files a/docs/物联网管控平台.pptx and b/docs/物联网管控平台.pptx differ
diff --git a/docs/资料/GBT 33745-2017 物联网 术语.pdf b/docs/资料/GBT 33745-2017 物联网 术语.pdf
new file mode 100644
index 00000000..58d1a112
Binary files /dev/null and b/docs/资料/GBT 33745-2017 物联网 术语.pdf differ
diff --git a/projects/Infrastructure/Infrastructure.csproj b/projects/Infrastructure/Infrastructure.csproj
index 76794160..34b0b33f 100644
--- a/projects/Infrastructure/Infrastructure.csproj
+++ b/projects/Infrastructure/Infrastructure.csproj
@@ -18,7 +18,7 @@
-
+
diff --git a/projects/Infrastructure/Views/Shared/_Header.cshtml b/projects/Infrastructure/Views/Shared/_Header.cshtml
index 4f83519d..6a1b812f 100644
--- a/projects/Infrastructure/Views/Shared/_Header.cshtml
+++ b/projects/Infrastructure/Views/Shared/_Header.cshtml
@@ -1,5 +1,6 @@
-
+
+
diff --git a/projects/IoTCenter/Application/Models/EditGlobalIoTTimerModel.cs b/projects/IoTCenter/Application/Models/EditGlobalIoTTimerModel.cs
index bb872eb3..9bbffd49 100644
--- a/projects/IoTCenter/Application/Models/EditGlobalIoTTimerModel.cs
+++ b/projects/IoTCenter/Application/Models/EditGlobalIoTTimerModel.cs
@@ -12,6 +12,7 @@ namespace IoTCenter.Application.Models
public string Name { get; set; }
[Display(Name = "定时器规则")]
+ [UIHint("Cron")]
[Remote("CronValid", "Ajax", "Admin")]
[Required(ErrorMessage = nameof(RequiredAttribute))]
public string Cron { get; set; }
diff --git a/projects/IoTCenter/Areas/Admin/Views/Shared/_Menu.cshtml b/projects/IoTCenter/Areas/Admin/Views/Shared/_Menu.cshtml
index 052a6558..51d52666 100644
--- a/projects/IoTCenter/Areas/Admin/Views/Shared/_Menu.cshtml
+++ b/projects/IoTCenter/Areas/Admin/Views/Shared/_Menu.cshtml
@@ -23,7 +23,7 @@
平台场景命令管理
平台定时器管理
平台定时器命令管理
- 平台触发器管理
+ 平台触发器管理
平台触发器命令管理
diff --git a/projects/IoTCenter/appsettings.json b/projects/IoTCenter/appsettings.json
index 6ec89a15..2cf15df0 100644
--- a/projects/IoTCenter/appsettings.json
+++ b/projects/IoTCenter/appsettings.json
@@ -1,5 +1,5 @@
{
- "version": "1.0.0-rc.1217",
+ "version": "1.0.0-rc.1218",
"Logging": {
"LogLevel": {
"Default": "Warning",
diff --git a/projects/UserCenter/UserCenter.csproj b/projects/UserCenter/UserCenter.csproj
index 842c8e63..f32ca769 100644
--- a/projects/UserCenter/UserCenter.csproj
+++ b/projects/UserCenter/UserCenter.csproj
@@ -14,7 +14,7 @@
-
+