Merge Setting and SW_Table branches into main, fix conflicts, and resolve TS build errors

src/core/excelHandler.ts

@@ -38,6 +38,7 @@ export interface HardwareAsset {
   서버PW?: string;
   모니터링?: string;
   비고?: string;
+  현사용조직?: string;
 }
 
 

src/core/state.ts

@@ -14,7 +14,9 @@ const dummy = generateDummyData();
 // 서버 데이터만 실제 데이터로 교체
 const mergedHw: HardwareAsset[] = [
   ...dummy.hw.filter(a => a.type !== '서버'),
-  ...realServerData.map(s => ({
+  ...realServerData.map((serverData: any) => {
+    const s = serverData;
+    return {
     id: s.id || Math.random().toString(36).substring(2, 9),
     type: '서버',
     법인: s.법인,
@@ -47,7 +49,7 @@ const mergedHw: HardwareAsset[] = [
     서버PW: s.서버PW || '',
     모니터링: s.모니터링 || '',
     비고: s.비고 || ''
-  }))
+  }})
 ];
 
 // --- Initial State ---