x

application/inter/controller/Application.php

@@ -91,11 +91,7 @@ class Application extends Base
             ->where('sc.status', 1)
             ->order('sr.sort asc')
             ->order('sc.sort asc')
-<<<<<<< HEAD
             ->field('sc.hid, sc.did, sc.id, sc.cost, sc.describe, sr.id as sid, sr.name, sr.color, d.realname as dname, i.name as hname')
-=======
-            ->field('sc.hid, sc.did, sc.id, sc.cost, sc.describe, sr.id as sid, sr.name, sr.check, sr.color, d.realname as dname, i.name as hname')
->>>>>>> 8a36d64298b2e5db9528fcd4e90cd67e922c413f
             ->select();
             // 特殊机构
             if(!empty($special_doctors)) {