解决冲突

src/view/memberGroup/edit-tag.vue

@@ -108,7 +108,6 @@ export default {
   .tag-name {
     display: inline-block;
     vertical-align: middle;
-<<<<<<< HEAD
     font-size: 16px;
     font-weight: bold;
     color: #303133;
@@ -121,9 +120,6 @@ export default {
       background: #1890FF;
       border-radius: 0 5px 0 5px;
     }
-=======
-    margin-bottom: 5px;
->>>>>>> origin/dev
   }
   .icon-tag-name {
     display: inline-block;

src/view/memberGroup/memberGroupList.vue

@@ -59,11 +59,7 @@
                 {{ scope.row.isRealTime === 1 ? '实时' : '非实时' }}
               </template>
             </el-table-column>
-<<<<<<< HEAD
             <el-table-column label="最近更新时间" show-overflow-tooltip >
-=======
-            <el-table-column label="最近更新时间" show-overflow-tooltip width="230px">
->>>>>>> origin/dev
               <template slot-scope="scope">
                 <p class="h-18">{{ scope.row.latestUpdateTime | formatTimeYMD }}</p>
                 <p class="h-18">{{ scope.row.latestUpdateTime | formatTimeHMS }}</p>
@@ -112,11 +108,7 @@
                 <p class="h-18">{{ scope.row.effectiveDate | formatTimeHMS }}</p>
               </template>
             </el-table-column>
-<<<<<<< HEAD
             <el-table-column label="操作" width="130">
-=======
-            <el-table-column label="操作" width="150px">
->>>>>>> origin/dev
               <template slot-scope="scope">
                 <router-link
                   :to="`/memberGroupDetail?memberTagGroupId=${scope.row.memberTagGroupId}`"

src/view/platformTag/member-tag.vue

@@ -58,13 +58,9 @@
       <vue-gic-footer></vue-gic-footer>
     </div>
 
-<<<<<<< HEAD
-    <div class="group-right-list" v-show="groupShow">
-=======
     <!-- <div class="deal-list-mask" v-show="groupShow"></div> -->
 
     <div class="group-right-list"  :class="{'group-transtion-list': groupShow}">
->>>>>>> origin/dev
       <div class="group-title">
         <i class="iconfont icon-17" />
         已经选标签：

src/view/platformTag/tag-type.vue

@@ -98,10 +98,7 @@ export default {
     }
   }
   .second-tag {
-<<<<<<< HEAD
     padding: 10px 0px 10px 23px;
-=======
->>>>>>> origin/dev
     margin: 0 1px;
     font-size: 14px;
     color: #303133;