Merge branch 'master' of http://47.112.200.206:3000/aijia/kmt

# Conflicts:
#	src/components/MenuComponent.vue

src/store/modules/user.js

@@ -222,7 +222,7 @@ const user = {
     GetTeacherSalaryList({ commit, state }, data) {
       return new Promise((resolve, reject) => {
         axios.post(GetTeacherSalaryList, data).then(response => {
-          const data = response.data
+          const data = response.data || { }
           commit('SET_TEACHER_SALARY_LIST', data);
           // debugger
           resolve(response)