From 377d992bc9444224573efdd61aedc081a659c126 Mon Sep 17 00:00:00 2001
From: sanguu <sanguu516@naver.com>
Date: Thu, 6 Oct 2022 17:28:42 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EC=9D=B4=EB=A0=A5,?=
 =?UTF-8?q?=EA=B3=84=ED=9A=8D(=EC=BB=AC=EB=9F=BC=20=EC=9C=84=EC=B9=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basis/flight/plan/FlightPlanGroupGrid.js  | 40 +++++++++----------
 .../flight/aprv/FlightPlanAprvContainer.js    | 33 +++++++--------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/src/components/basis/flight/plan/FlightPlanGroupGrid.js b/src/components/basis/flight/plan/FlightPlanGroupGrid.js
index 8a6aca5..31e3dd1 100644
--- a/src/components/basis/flight/plan/FlightPlanGroupGrid.js
+++ b/src/components/basis/flight/plan/FlightPlanGroupGrid.js
@@ -12,22 +12,6 @@ const FlightPlanGroupGrid = ({
   pagination,
 }) => {
   const columns = [
-    {
-      name: '생성일시',
-      selector: row => row?.createDt,
-      sortable: true,
-      cell: row => {
-        return row?.createDt ? row.createDt : '-';
-      }
-    },
-    {
-      name: '가입일시',
-      selector: row => row?.joinDt,
-      sortable: true,
-      cell: row => {
-        return row?.joinDt ? row.joinDt : '-';
-      }
-    },
     {
       // id: 'groupNm',
       name: '그룹 명',
@@ -44,6 +28,22 @@ const FlightPlanGroupGrid = ({
       sortable: true,
       cell: row => <div>{row.groupId}</div>
     },
+    {
+      name: '생성일시',
+      selector: row => row?.createDt,
+      sortable: true,
+      cell: row => {
+        return row?.createDt ? row.createDt : '-';
+      }
+    },
+    {
+      name: '가입일시',
+      selector: row => row?.joinDt,
+      sortable: true,
+      cell: row => {
+        return row?.joinDt ? row.joinDt : '-';
+      }
+    },
     {
       sortable: true,
       cell: row => {
@@ -86,10 +86,10 @@ const FlightPlanGroupGrid = ({
       <div className='invoice-list-wrapper'>
         <Card>
           <div className='invoice-list-dataTable'>
-            <GridDatabase 
-            data={data}
-             count={count} 
-             columns={columns}
+            <GridDatabase
+              data={data}
+              count={count}
+              columns={columns}
               pagination={pagination}
               paginationPerPage={5}
               paginationRowsPerPageOptions={paginationRowsPerPageOptions}
diff --git a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
index 83d8aff..50ab0ba 100644
--- a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
+++ b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
@@ -48,22 +48,6 @@ const FlightPlanAprvContainer = () => {
   });
 
   const columns = [
-    {
-      name: '생성일시',
-      selector: row => row?.createDt,
-      sortable: true,
-      cell: row => {
-        return row?.createDt ? row.createDt : '-';
-      }
-    },
-    {
-      name: '가입일시',
-      selector: row => row?.joinDt,
-      sortable: true,
-      cell: row => {
-        return row?.joinDt ? row.joinDt : '-';
-      }
-    },
     {
       // id: 'groupNm',
       name: '그룹 명',
@@ -83,6 +67,23 @@ const FlightPlanAprvContainer = () => {
       sortable: true,
       cell: row => <div>{row.groupId}</div>
     },
+    
+    {
+      name: '생성일시',
+      selector: row => row?.createDt,
+      sortable: true,
+      cell: row => {
+        return row?.createDt ? row.createDt : '-';
+      }
+    },
+    {
+      name: '가입일시',
+      selector: row => row?.joinDt,
+      sortable: true,
+      cell: row => {
+        return row?.joinDt ? row.joinDt : '-';
+      }
+    },
     {
       name: '',
       sortable: true,