|
@@ -97,8 +97,6 @@ class PersonSalaryService extends Service
|
|
|
$merge = [];
|
|
$merge = [];
|
|
|
$merge['employee_title'] = $tmp['title'];
|
|
$merge['employee_title'] = $tmp['title'];
|
|
|
$merge['employee_number'] = $tmp['number'];
|
|
$merge['employee_number'] = $tmp['number'];
|
|
|
- $merge['start_time'] = date("Y-m-d", $value['start_time']);
|
|
|
|
|
- $merge['end_time'] = date("Y-m-d", $value['end_time']);
|
|
|
|
|
$data[$key] = array_merge($value, $merge);
|
|
$data[$key] = array_merge($value, $merge);
|
|
|
}
|
|
}
|
|
|
|
|
|
