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

@@ -91,7 +91,11 @@ class TemplateController extends BaseController
      */
      */
     public function html_index($template_id){
     public function html_index($template_id){
 
 
-        $lists = (new ATemplateHtml)->list([['template_id','=',$template_id]],$this->order,['id','name','status','is_default','sort','thumb','url','created_at','updated_at']);
+        $lists = (new ATemplateHtml)->list(
+            ['template_id'=>$template_id],
+            $this->order
+//            , ['id','name','status','is_default','sort','thumb','url','created_at','updated_at']
+        );
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
 
 
     }
     }