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

@@ -125,9 +125,7 @@ class CustomTemplateController extends BaseController
         ],[
             'source_id.required' => 'ID不能为空',
         ]);
-        $this->map['source'] = 9;
-        $this->map['is_custom'] = 0;
-        $lists = $bTemplateLog->list($this->map,'id',['id','template_id','operator_id','source','created_at','updated_at'],'desc',10);
+        $lists = $bTemplateLog->list(['source'=>9,'is_custom'=>0],'id',['id','template_id','operator_id','source','created_at','updated_at'],'desc',10);
         if(!empty($lists)){
             $templateModel = new Template();
             $userModel = new User();