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

@@ -35,7 +35,7 @@ class CustomRequest extends FormRequest
             'title'   =>  [],//'required','max:200'
             'title'   =>  [],//'required','max:200'
             'keywords'   =>  [],//'required','max:200'
             'keywords'   =>  [],//'required','max:200'
             'description'   =>  [],//'required','max:250'
             'description'   =>  [],//'required','max:250'
-            'html'   =>  ['required'],
+//            'html'   =>  ['required'],
             'url'   =>  ['required','max:200','url'],
             'url'   =>  ['required','max:200','url'],
             'status'   =>  ['required','in:0,1'],
             'status'   =>  ['required','in:0,1'],
         ];
         ];
@@ -44,10 +44,6 @@ class CustomRequest extends FormRequest
         if($this->is('b/custom/update')){
         if($this->is('b/custom/update')){
             $rule['id'] = ['required','integer'];
             $rule['id'] = ['required','integer'];
         }
         }
-        // 新增
-        if($this->is('b/custom/create')){
-            unset($rule['html']);
-        }
 
 
         // 删除
         // 删除
         if($this->is('b/custom/delete')){
         if($this->is('b/custom/delete')){