Merge remote-tracking branch 'origin/rongxin_dev' into rongxin_dev

src/store/modules/user.js

@@ -17,6 +17,7 @@ const user = {
     baseRoutingUrl: '',
     businessLevel: '',
     userId:null,
+    deptId:null,
   },
 
   mutations: {