diff --git a/src/components/Charts/ChartCard.vue b/src/components/Charts/ChartCard.vue
index fc1f425..b72d378 100644
--- a/src/components/Charts/ChartCard.vue
+++ b/src/components/Charts/ChartCard.vue
@@ -12,9 +12,7 @@
diff --git a/src/views/mycollection/index.vue b/src/views/mycollection/index.vue
index d58b10e..d0db6f2 100644
--- a/src/views/mycollection/index.vue
+++ b/src/views/mycollection/index.vue
@@ -1,6 +1,6 @@
-
+
>>>>>>>>.', this.activeTab)
this.initData()
},
diff --git a/src/views/mycourse/mycourseList/MyCourseList.vue b/src/views/mycourse/mycourseList/MyCourseList.vue
index b63fdd3..3dbd740 100644
--- a/src/views/mycourse/mycourseList/MyCourseList.vue
+++ b/src/views/mycourse/mycourseList/MyCourseList.vue
@@ -61,6 +61,7 @@