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

@@ -147,6 +147,7 @@ class BaseController extends Controller
             return empty($data) ? is_array($data) ? [] : '' : $data;
             return empty($data) ? is_array($data) ? [] : '' : $data;
         }
         }
         foreach ($data as $k => $v) {
         foreach ($data as $k => $v) {
+            var_dump($v);
             if (is_array($v)) {
             if (is_array($v)) {
                 $data[$k] = $this->_extents($v);
                 $data[$k] = $this->_extents($v);
             } else {
             } else {

@@ -24,8 +24,6 @@ class ATemplateController extends BaseController
      */
      */
     public function lists(ATemplateLogic $aTemplateLogic){
     public function lists(ATemplateLogic $aTemplateLogic){
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order);
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order);
-        var_dump($lists);
-        die();
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
     /**
     /**