From 0692f4289ee0046a50602adc065f1ececa90dfea Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期日, 19 十月 2025 16:54:29 +0800
Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-1.2.0.1

---
 src/views/EmploymentManage/constants/columns.ts |   34 +++++++++++++++++++++++++++-------
 1 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/views/EmploymentManage/constants/columns.ts b/src/views/EmploymentManage/constants/columns.ts
index 825600f..2cd5a95 100644
--- a/src/views/EmploymentManage/constants/columns.ts
+++ b/src/views/EmploymentManage/constants/columns.ts
@@ -38,26 +38,41 @@
   },
   {
     id: '8',
+    enCode: 'applyBeginTime',
+    name: '鎶ュ悕寮�濮�',
+  },
+  {
+    id: '9',
+    enCode: 'applyEndTime',
+    name: '鎶ュ悕缁撴潫',
+  },
+  {
+    id: '10',
+    enCode: 'applyStatus',
+    name: '鎶ュ悕鐘舵��',
+  },
+  {
+    id: '11',
     enCode: 'status',
     name: '浠诲姟鐘舵��',
   },
   {
-    id: '9',
+    id: '12',
     enCode: 'createdTime',
     name: '鍙戝竷鏃ユ湡',
   },
   {
-    id: '10',
+    id: '13',
     enCode: 'beginTime',
-    name: '寮�濮嬫棩鏈�',
+    name: '浠诲姟寮�濮嬫棩鏈�',
   },
   {
-    id: '11',
+    id: '14',
     enCode: 'endTime',
-    name: '缁撴潫鏃ユ湡',
+    name: '浠诲姟缁撴潫鏃ユ湡',
   },
   {
-    id: '12',
+    id: '15',
     enCode: 'releaseStatus',
     name: '鍙戝竷鐘舵��',
   },
@@ -182,11 +197,16 @@
   },
   {
     id: '8',
+    enCode: 'checkReceiveMethod',
+    name: '楠屾敹鏂瑰紡',
+  },
+  {
+    id: '9',
     enCode: 'checkReceiveStatus',
     name: '浠诲姟楠屾敹鐘舵��',
   },
   {
-    id: '9',
+    id: '10',
     enCode: 'lastCheckReceiveTime',
     name: '鏈�杩戦獙鏀舵椂闂�',
   },

--
Gitblit v1.9.1