Merge branch 'group_0313'

app/common/model/works/ServiceWork.php

@@ -77,7 +77,7 @@ class ServiceWork extends BaseModel
         }
 
         // 长期工程师不结算
-        if((int)MasterWorker::where('master_worker_id',$model->master_worker_id)->value('type') === 2) $is_settlement = false;
+        if((int)MasterWorker::where('id',$model->master_worker_id)->value('type') === 2) $is_settlement = false;
 
         if($is_settlement){
             if($model->user_equity_id > 0){