Merge branch 'liuzj-1000959-dev' into test

modules/Channel/Http/Controllers/PayTemplateController.php

@@ -43,10 +43,7 @@ class PayTemplateController extends CatchController
         $name = $request->get('name');
         // 1-首充模板,2-非首充模板
         $type = $request->input('type');
-        $where = [[
-            'uid','=',$uid,
-            'type', '=', $type,
-        ]];
+        $where = [['uid','=',$uid,], ['type', '=', $type,]];
         if($name){
             $where[] = ['name','like','%'.$name.'%'];
         }