Skip to content

A
admin-base
Commit e985d1c5 authored by chenyishuai@singsingenglish.com's avatar chenyishuai@singsingenglish.com
Browse files
Options

82

parent fe0147ee
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
src/components/teacher/index.vue
View file @ e985d1c5
...@@ -269,11 +269,7 @@ ...@@ -269,11 +269,7 @@
</template> </template>
<script> <script>
<<<<<<< HEAD
import {getTeacherListApi,delTeacherApi,getTeacherTypeListApi} from "../../service/api";
=======
import {getTeacherListApi,delTeacherApi,getStaffListApi,postTransferTeacherApi} from "../../service/api"; import {getTeacherListApi,delTeacherApi,getStaffListApi,postTransferTeacherApi} from "../../service/api";
>>>>>>> 7eac8ec72de81e0c7b5610134985fc3233ab244e
import {TEACHERTYPE} from "../../util/wordbook"; import {TEACHERTYPE} from "../../util/wordbook";
import page from '../framework/page' import page from '../framework/page'
import teacherDetail from '../teacherDetail/index' import teacherDetail from '../teacherDetail/index'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment