From 485125c2b5b8862a5295216b24cf28121d8ca169 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 08 四月 2024 11:32:07 +0800
Subject: [PATCH] 解决冲突
---
Source/ProjectWeb/src/views/wel/dashboard.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Source/ProjectWeb/src/views/wel/dashboard.vue b/Source/ProjectWeb/src/views/wel/dashboard.vue
index 81b1879..ae18591 100644
--- a/Source/ProjectWeb/src/views/wel/dashboard.vue
+++ b/Source/ProjectWeb/src/views/wel/dashboard.vue
@@ -1,4 +1,4 @@
-<template>
+銆併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併�併��<template>
<basic-container>
<div class="wel">
<basic-block :width="width"
--
Gitblit v1.10.0