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

@@ -183,8 +183,8 @@ class BTemplateController extends BaseController
             'old_html'=>'required',
             'old_html'=>'required',
             'html'=>'required',
             'html'=>'required',
             'type'=>'required',
             'type'=>'required',
-            'is_custom'=>'required',
             'is_list'=>'required',
             'is_list'=>'required',
+            'is_custom'=>'required',
         ],[
         ],[
             'old_html.required' => '需替换的html不能为空',
             'old_html.required' => '需替换的html不能为空',
             'html.required' => 'html不能为空',
             'html.required' => 'html不能为空',