作者 李宇航

合并分支 'lyh-server' 到 'master'

gx



查看合并请求 !2363
@@ -39,7 +39,7 @@ class DomainInfoController extends BaseController @@ -39,7 +39,7 @@ class DomainInfoController extends BaseController
39 foreach ($lists['list'] as $k=>$v){ 39 foreach ($lists['list'] as $k=>$v){
40 $v['company'] = ''; 40 $v['company'] = '';
41 $v['ip_domain'] = []; 41 $v['ip_domain'] = [];
42 - $pro_info = $project_model->read(['id'=>$v['project_id']],['company']); 42 + $pro_info = $project_model->read(['id'=>$v['project_id']],['company','serve_id']);
43 if($pro_info !== false){ 43 if($pro_info !== false){
44 $v['company'] = $pro_info['company']; 44 $v['company'] = $pro_info['company'];
45 if(!empty($pro_info['serve_id'])){ 45 if(!empty($pro_info['serve_id'])){