From b5ce833799753acd0944e6901b8101f03263e1fa Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 20 Dec 2017 14:44:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/assets/i18n/zh-CN.json |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/assets/i18n/zh-CN.json b/src/assets/i18n/zh-CN.json
index 44d7e46..c785dae 100644
--- a/src/assets/i18n/zh-CN.json
+++ b/src/assets/i18n/zh-CN.json
@@ -11,6 +11,9 @@
     "sensor_management": "���������������",
     "sensor_management_info": "������������",
 
+	"system_management":"������������",
+	"system_management_account":"������������",
+	
     "settings": "������",
     "profile": "������������",
     "login": "������",

--
Gitblit v1.8.0