Merge branch 'dev' of http://192.168.0.115:3000/4dkankan/4dkankan_bim into dev

src/locales/en.json

@@ -23,7 +23,7 @@
     "setting": "Setting",
     "reset": "Reset",
     "userInfo": "User Info",
-    "loginout": "login Out",
+    "loginout": "Log out",
     "adjustText1": "Setting the associated location for a scene",
     "adjustText2": "Please select the location, make sure that the scenes in the left and right views are in the same location, and then click the button on the right to set it as the associated location.",
     "userLogin": "User login",