From 1b3728e527fdeb542279b663bb29418ba66ca33d Mon Sep 17 00:00:00 2001
From: shiji <1913712590@qq.com>
Date: Fri, 14 Jul 2023 09:29:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue b/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue
index db95e8d..b219635 100644
--- a/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue
+++ b/ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue
@@ -6,10 +6,10 @@
           <a-col :span="24">
             <a-form-model-item label="上级任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upperName">
               <j-popup
-                v-model="model.upperName"
-                field="upperName"
+                v-model="model.upperTaskName"
+                field="upperTaskName"
                 org-fields="id,task_name"
-                dest-fields="upperId,upperName"
+                dest-fields="upperId,upperTaskName"
                 code="taskname"
                 :multi="true"
                 @input="popupCallback"

From 5e4a9e59eb44cdb8bbcae32c9c1ce9ddf2a90ba8 Mon Sep 17 00:00:00 2001
From: shiji <1913712590@qq.com>
Date: Fri, 14 Jul 2023 09:44:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=96=B0=E5=A2=9E=20?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E8=A2=AB?=
 =?UTF-8?q?=E8=A6=86=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue
index c84769d..85bd64c 100644
--- a/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue
+++ b/ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue
@@ -232,7 +232,7 @@
           <!--              <a-input-number v-model="model.verison" placeholder="请输入版本号" style="width: 100%" />-->
           <!--            </a-form-model-item>-->
           <!--          </a-col>-->
-          <a-col :span="24" style="height: 3rem">
+          <a-col :span="24" >
             <a-form-model-item
               label="任务状态"
               :labelCol="labelCol"