Merge branch 'dujinkim' of https://github.com/DTS-Development/SHI_EVCP into dujinkim

1 files changed, 15 insertions, 12 deletions

diff --git a/lib/docu-list-rule/combo-box-settings/table/combo-box-options-table-columns.tsx b/lib/docu-list-rule/combo-box-settings/table/combo-box-options-table-columns.tsx
index e5780e9e..0e46c0ed 100644
--- a/lib/docu-list-rule/combo-box-settings/table/combo-box-options-table-columns.tsx
+++ b/lib/docu-list-rule/combo-box-settings/table/combo-box-options-table-columns.tsx
@@ -114,40 +114,43 @@ export function getColumns({ setRowAction }: GetColumnsProps): ColumnDef<ComboBo
       accessorKey: "code",
       enableResizing: true,
       header: ({ column }) => (
-        <DataTableColumnHeaderSimple column={column} title="코드" />
+        <DataTableColumnHeaderSimple column={column} title="code" />
       ),
       meta: {
-        excelHeader: "코드",
+        excelHeader: "code",
         type: "text",
       },
       cell: ({ row }) => row.getValue("code") ?? "",
       minSize: 80
     },
     {
-      accessorKey: "description",
+      accessorKey: "remark",
       enableResizing: true,
       header: ({ column }) => (
-        <DataTableColumnHeaderSimple column={column} title="값" />
+        <DataTableColumnHeaderSimple column={column} title="remark" />
       ),
       meta: {
-        excelHeader: "값",
+        excelHeader: "remark",
         type: "text",
       },
-      cell: ({ row }) => row.getValue("description") ?? "",
+      cell: ({ row }) => row.getValue("remark") ?? "",
       minSize: 80
     },
     {
-      accessorKey: "remark",
+      accessorKey: "updatedAt",
       enableResizing: true,
       header: ({ column }) => (
-        <DataTableColumnHeaderSimple column={column} title="비고" />
+        <DataTableColumnHeaderSimple column={column} title="updated_at" />
       ),
       meta: {
-        excelHeader: "비고",
-        type: "text",
+        excelHeader: "updated_at",
+        type: "date",
       },
-      cell: ({ row }) => row.getValue("remark") ?? "",
-      minSize: 80
+      cell: ({ row }) => {
+        const date = row.getValue("updatedAt") as Date
+        return date ? new Date(date).toLocaleDateString('ko-KR') : ""
+      },
+      minSize: 100
     }
   ]