|
|
@@ -100,7 +100,7 @@ class DeviceWorkService extends Service
|
|
|
$tmp = $map[$value['device_id']] ?? [];
|
|
|
$merge = [];
|
|
|
$merge['device_title'] = $tmp['title'];
|
|
|
- $merge['device_number'] = $tmp['number'];
|
|
|
+ $merge['device_number'] = $tmp['code'];
|
|
|
$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);
|
