fix(merge): resolve compile errors and restore remote db IP

src/components/Modal/HWModal.ts

@@ -751,7 +751,7 @@ class HwAssetModal extends BaseModal {
     // state.masterData.logs에서 해당 자산의 이력 필터링 (최신순)
     const logs = (state.masterData.logs || [])
       .filter(l => l.asset_id === assetId)
-      .sort((a, b) => new Date(b.created_at || b.log_date).getTime() - new Date(a.created_at || a.log_date).getTime());
+      .sort((a, b) => new Date(b.created_at || b.log_date || '').getTime() - new Date(a.created_at || a.log_date || '').getTime());
 
     if (logs.length === 0) { 
       container.innerHTML = '<div class="empty-history">기록된 변동 이력이 없습니다.</div>'; 

src/core/excelHandler.ts

@@ -27,10 +27,15 @@ export interface SWUser {
 
 export interface HardwareLog {
   id: string;
-  assetId: string;
-  date: string;
+  assetId?: string;
+  asset_id?: string;
+  date?: string;
+  log_date?: string;
+  created_at?: string;
   details: string;
-  user: string;
+  user?: string;
+  log_user?: string;
+  event_type?: string;
 }
 
 export interface MasterAssetData {

src/styles/dashboard.css

@@ -518,5 +518,4 @@
   flex: 1;
   font-size: 0.95rem;
   font-weight: 700;
->>>>>>> origin/main
 }