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

@@ -187,6 +187,7 @@ class ATemplateController extends BaseController
         }
         }
         $filed = ['id','name','status','image','created_at'];
         $filed = ['id','name','status','image','created_at'];
         $this->map['test_model'] = 0;
         $this->map['test_model'] = 0;
+        $this->map['project_id'] = 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'])){