From 60b58b47cecd7611ad8df2561a84bf0548ad6ad9 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 20 Dec 2017 13:54:45 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend.git into develop

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

diff --git a/src/assets/i18n/zh-CN.json b/src/assets/i18n/zh-CN.json
index 2488a5e..c785dae 100644
--- a/src/assets/i18n/zh-CN.json
+++ b/src/assets/i18n/zh-CN.json
@@ -1,5 +1,19 @@
 {
     "home": "������",
+    "user_management": "������������",
+    "user_management_install": "������������",
+    "user_management_receive": "������������",
+    "device_management": "������������",
+    "device_management_info": "������������",
+    "device_management_version": "������������",
+    "device_management_point": "���������������",
+
+    "sensor_management": "���������������",
+    "sensor_management_info": "������������",
+
+	"system_management":"������������",
+	"system_management_account":"������������",
+	
     "settings": "������",
     "profile": "������������",
     "login": "������",

--
Gitblit v1.8.0