From 39abebc6d54083556a393441e0628bc3d93b46c7 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 25 Oct 2025 13:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v7.0/7.0.2' into feature/v7.0/7.0.2

---
 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