|
@@ -196,7 +196,7 @@ class ScreenService extends Service
|
|
|
->leftJoin('device_type as c','c.id','b.device_type_id')
|
|
|
->where('a.screen_id',$data['screen_id'])
|
|
|
->where('a.del_time',0)
|
|
|
- ->select('a.id','b.id as device_id','b.title','b.code','b.gateway_id','b.device_type_id','b.remark','c.title as device_type_name','b.size');
|
|
|
+ ->select('a.id','b.id as device_id','b.title','b.code','b.gateway_id','b.device_type_id','b.remark','c.title as device_type_name','b.size','b.unit');
|
|
|
|
|
|
if(! empty($data['gateway_id'])) $model->where('b.gateway_id',$data['gateway_id']);
|
|
|
$list = $this->limit($model,'',$data);
|