Merge remote-tracking branch 'origin/master' into akun

@@ -32,7 +32,7 @@ class BTemplateModuleController extends BaseController
         $moduleProjectModel = new BModuleProject();
         $moduleProjectModel = new BModuleProject();
         $module_list = $moduleProjectModel->list(['project_id'=>$this->user['project_id']]);
         $module_list = $moduleProjectModel->list(['project_id'=>$this->user['project_id']]);
         $data['module_list'] = $module_list;
         $data['module_list'] = $module_list;
-        $this->response('success',Code::SUCCESS,$data);
+        $this->response('success',Code::SUCCESS,$list);
     }
     }
 
 
     /**
     /**