Merge branch 'master' of git://192.168.1.116/bolan-root/frontend/manager-app-sz into wq

# Conflicts: # src/models/login.js # src/routes/login.js #添加新界面到main ，个人中心和房屋信息

Merge branch 'master' of git://192.168.1.116/bolan-root/frontend/manager-app-sz into wq
52220da4 · 吴强 · 7958ee2c · 52220da4 · 52220da4 · 52220da4
--- a/package-lock.json
+++ b/package-lock.json
--- a/src/routes/main/home/fwInfo.js
+++ b/src/routes/main/home/fwInfo.js
--- a/src/routes/main/home/index.js
+++ b/src/routes/main/home/index.js
--- a/src/routes/main/home/userinfopage.js
+++ b/src/routes/main/home/userinfopage.js