解决冲突

src/view/platformTag/member-tag.vue

@@ -675,13 +675,8 @@ export default {
     bottom: 0px;
     box-shadow: 0 0 5px #bbb;
     background-color: #fff;
-<<<<<<< HEAD
-    z-index: 100;
-    transition: all 0.3s ease-in-out;
-=======
     z-index: 1001;
     transition: all .3s ease-in;
->>>>>>> origin/dev
     .group-title {
       padding: 10px;
       height: 50px;