Merge branch 'liuzj-1000959-dev' into test

modules/Channel/Models/PayTemplate.php

@@ -8,7 +8,7 @@ class PayTemplate extends BaseModel
     protected $table = 'pay_templates';
 
     protected $fillable = [
-        'id', 'name', 'uid','status', 'created_at', 'updated_at',
+        'id', 'name', 'uid','status', 'created_at', 'updated_at','type'
     ];
 
 }