解决版本冲突

src/pages/home/SchoolManager.vue

@@ -492,7 +492,6 @@
   </div>
 </template>
 <script>
-<<<<<<< HEAD
 import { mapGetters, mapActions } from "vuex";
 export default {
   components: {},
@@ -511,23 +510,6 @@ export default {
       ModelStudet:false, //学生详情弹框
       isDown: false,
       options: [
-=======
-  import { mapGetters, mapActions } from "vuex";
-  export default {
-    components: { },
-    name: "actvResolveLabel",
-    props: {},
-    data() {
-      return {
-        // BASE_URL:'https://img.sharingschool.com',
-        BASE_URL:'https://xt.sharingschool.com/upload/',
-        isDownindex:0,
-        modelindex: 0,
-        hiddenModel:false,
-        isPigai:false,
-        isDown:false,
-            options: [
->>>>>>> 9d24aa96a7db77f00d14035d905add3b93c0ac00
         {
           value: "0",
           label: "一年级"

src/store/getters.js

@@ -7,7 +7,6 @@ const getters = {
   addRouters: state => state.permission.addRouters,
   roles: state => state.user.roles,
   monitorTeacherList: state => state.user.monitorTeacherList,
-<<<<<<< HEAD
   TeacherHomeworkList: state => state.user.TeacherHomeworkList,
   TeacherAllotList: state => state.user.TeacherAllotList,
   TeacherAllotstatus: state => state.user.TeacherAllotstatus,
@@ -16,13 +15,11 @@ const getters = {
   UnallotHomeworkInfo: state => state.user.UnallotHomeworkList,
   GetTeacherDetail: state => state.user.GetTeacherDetail,
   GetStudentDetail: state => state.user.GetStudentDetail,
-=======
   getManagerList: state => state.user.getManagerList,
   getManagerDetail: state => state.user.getManagerDetail,
   downgrade: state => state.user.downgrade,
   applyTeacherList: state => state.user.applyTeacherList,
   applyOperate: state => state.user.applyOperate,
   getTeacherSalaryList: state => state.user.getTeacherSalaryList,
->>>>>>> 9d24aa96a7db77f00d14035d905add3b93c0ac00
 }
 export default getters