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

@@ -185,6 +185,7 @@ class ATemplateController extends BaseController
             $this->response('非法请求',Code::SYSTEM_ERROR, []);
             $this->response('非法请求',Code::SYSTEM_ERROR, []);
         }
         }
         $filed = ['id','name','status','image','created_at'];
         $filed = ['id','name','status','image','created_at'];
+        $this->map['test_model'] = 0;
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
         $data = [];
         $data = [];
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){