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

@@ -168,20 +168,21 @@ class ATemplateController extends BaseController
         }
         }
 
 
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order);
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order);
-        $result = [];
+        $data = [];
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
-                $result[] = [
+                $data[] = [
                     'id' => $v['id'],
                     'id' => $v['id'],
-                    'name' => 'name',
-
-                    'status' => 'status',
+                    'name' => $v['name'],
+                    'status' => $v['status'],
                     'image_link' => getImageUrl($v['image']),
                     'image_link' => getImageUrl($v['image']),
                     'created_at' => $v['created_at']
                     'created_at' => $v['created_at']
                 ];
                 ];
             }
             }
         }
         }
-        $this->response('success',Code::SUCCESS,$result);
+        unset($lists['list']);
+        $lists['data'] = $data;
+        $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
     /**
     /**