fix: 冲突

src/views/Jyh/PersonalCenter/Detail/EarlyWarningPerson.vue

@@ -6,11 +6,7 @@
         <d-column field="code" header="时间"></d-column>
         <d-column field="name" header="标题">
           <template #default="scope">
-<<<<<<< HEAD
-            <a @click="openWarningDetail(scope.row)">{{scope.row.name}}</a>
-=======
-            <a>{{ scope.row.name }}</a>
->>>>>>> wsw
+            <a @click="openWarningDetail(scope.row)">{{ scope.row.name }}</a>
           </template>
         </d-column>
         <d-column field="detail" header="详情"></d-column>
@@ -48,7 +44,6 @@ const licenseTableData = ref([
   { code: '05822156', name: 'MIT License', detail: 'integer', owner: 'admin', level: 2, status: 1 },
   { code: '05822156', name: 'MIT License', detail: 'integer', owner: 'admin', level: 1, status: 2 }
 ]);
-<<<<<<< HEAD
 
 const warningModalVisable = ref(false);
 const currentWarning = ref();
@@ -59,8 +54,6 @@ const openWarningDetail = (row) => {
 const colseWarningDetail = () => {
   warningModalVisable.value = false;
 };
-=======
->>>>>>> wsw
 </script>
 
 <style scoped lang="scss">