From 493d1a3cd6a8faab11a1be78fa0d1ddd9f762170 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 1 Aug 2024 15:20:05 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/smartImport/cpts/executeTask.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/smartImport/cpts/executeTask.vue b/src/views/modules/base/smartImport/cpts/executeTask.vue
index fb8629611..9c6237ca9 100644
--- a/src/views/modules/base/smartImport/cpts/executeTask.vue
+++ b/src/views/modules/base/smartImport/cpts/executeTask.vue
@@ -30,7 +30,7 @@
           ></el-icon>
           操作说明
         </h4>
-        <p>1、导入数据多大，系统需要一定事件处理。</p>
+        <p>1、导入数据过大，系统需要一定事件处理。</p>
         <p>
           2、导入过程中可查看导入明细，如果发现导入数据问题较多，可以取消本次导入，重新整理数据后，重新创建任务导入。
         </p>

From fb71b3b33fcea4188cb1ce155e3005a0af9c61a3 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 1 Aug 2024 15:54:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/smartImport/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/smartImport/index.vue b/src/views/modules/base/smartImport/index.vue
index fb69c30a5..0f16f2647 100644
--- a/src/views/modules/base/smartImport/index.vue
+++ b/src/views/modules/base/smartImport/index.vue
@@ -56,7 +56,7 @@
           </el-table-column>
           <el-table-column prop="importFailNum" align="center" width="80" label="失败数目" :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column prop="operatorName" align="center" width="100" label="操作人" :show-overflow-tooltip="true"> 
+          <el-table-column prop="createdByName" align="center" width="100" label="操作人" :show-overflow-tooltip="true"> 
           </el-table-column>
           <el-table-column prop="completedTime" align="center" width="180" label="操作完成时间"
             :show-overflow-tooltip="true">

From 33940957e32b075be062ee072fe2574c7e18638f Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 1 Aug 2024 17:24:04 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E9=BB=98=E8=AE=A4=E8=A7=92=E8=89=B2=E5=90=8E?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E5=8D=95=E8=A2=AB=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/role/roleForm.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue
index bb2cd048c..49054d99d 100644
--- a/src/views/modules/workSys/role/roleForm.vue
+++ b/src/views/modules/workSys/role/roleForm.vue
@@ -136,8 +136,9 @@ export default {
         this.formData.id = roleId
         this.defaultRole = defaultRole
         this.loadFormData()
+      }else{
+        this.defaultRole = '0'
       }
-
       this.endLoading()