From a72135a55ba6396dd5d8e6f9ed1ac8657c7de60f Mon Sep 17 00:00:00 2001
From: farhan048 <achmadfarhanmushafa@gmail.com>
Date: Thu, 19 Oct 2023 12:59:08 +0700
Subject: [PATCH] resolve conflict

---
 app/Models/HumanResource.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Models/HumanResource.php b/app/Models/HumanResource.php
index 222a835..1f28852 100644
--- a/app/Models/HumanResource.php
+++ b/app/Models/HumanResource.php
@@ -33,6 +33,7 @@ class HumanResource extends Model
         'updated_at', 
         'updated_by',
         'divisi_id',
-        'status_boundary'
+        'status_boundary',
+        'company_id'
     ];
 }