修改类型值

src/views/customer/detail.vue

@@ -205,6 +205,7 @@
                   <el-tag v-if="scope.row.opnType == 10">分配</el-tag>
                   <el-tag v-else-if="scope.row.opnType == 20">转移</el-tag>
                   <el-tag v-else-if="scope.row.opnType == 30">领取</el-tag>
+                  <el-tag v-else-if="scope.row.opnType == 40">合并</el-tag>
                 </template>
               </el-table-column>
               <el-table-column align="center" label="操作人" prop="createdName" />