From d94baed69ebfa0347b321d6fee42dded181161fe Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 15 Nov 2025 20:28:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 src/views/job/components/TaskIntermediateContent/AddTask.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/job/components/TaskIntermediateContent/AddTask.vue b/src/views/job/components/TaskIntermediateContent/AddTask.vue
index 0e1c24f..78b7ca1 100644
--- a/src/views/job/components/TaskIntermediateContent/AddTask.vue
+++ b/src/views/job/components/TaskIntermediateContent/AddTask.vue
@@ -114,7 +114,7 @@
 
 <script setup>
 import { ElMessage } from 'element-plus'
-// import { pxToRem } from '@/utils/rem'
+import { pxToRem } from '@/utils/rem'
 import { getWaylineList, createTask } from '@/api/job/task'
 // import TaskAlgorithmBusiness from '../components/TaskAlgorithmBusiness.vue'
 // import TaskMap from './TaskMap.vue'

--
Gitblit v1.9.3