CompanyId for Shift and DailyAllowance
Merge branch 'master' of https://github.com/dimasrijkiansyah/Bumblebee