Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -29,6 +29,9 @@ class EmailController extends BaseController
 
     public function list(Email $emailModel)
     {
+        if(!empty($this->param['email'])){
+            $this->map['email'] = ['like','%'.$this->param['email'].'%'];
+        }
         $lists = $emailModel->lists($this->map, $this->page, $this->row);
         $this->response('success', Code::SUCCESS, $lists);
     }