From 4f44fbb830d506669f9cc1958be7b006fbacd900 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 15 十月 2025 14:18:06 +0800
Subject: [PATCH] Merge branch 'dev-1.1.2' of http://120.26.58.240:8888/r/flexJobAdmin into dev-1.1.2
---
src/views/TraceIdLogManage/TraceIdLogManageList.vue | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/views/TraceIdLogManage/TraceIdLogManageList.vue b/src/views/TraceIdLogManage/TraceIdLogManageList.vue
index 7202d14..c8c9390 100644
--- a/src/views/TraceIdLogManage/TraceIdLogManageList.vue
+++ b/src/views/TraceIdLogManage/TraceIdLogManageList.vue
@@ -8,11 +8,7 @@
v-model="state.traceId"
style="width: 260px"
placeholder="traceID"
-<<<<<<< HEAD
@on-click-search="refetch()"
-=======
- @on-click-search="refetch"
->>>>>>> 06c6ff19cf33a902ec66529629f6171d699776ce
>
</SearchInput>
</QueryFilterItem>
--
Gitblit v1.9.1