Merge remote-tracking branch 'origin/master'

src/api/school-center/louZhang/zjlSalaryManagerAPI.js

@@ -19,7 +19,7 @@ let createSalary = (params) => postAction(prefix + "/zjlWage/createSalary",param
 export {
 export {
     initSubstName,
     initSubstName,
     getSchoolNames,
     getSchoolNames,
-    excelOut,
+    uploadExcel,
     downloadMoBan,
     downloadMoBan,
     zjlSalaryList,
     zjlSalaryList,
     zjlSalaryDelete,
     zjlSalaryDelete,