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

@@ -26,7 +26,7 @@ class BlogCategoryRequest extends FormRequest
         return [
         return [
             'name'=>'required|max:100',
             'name'=>'required|max:100',
             'remark'=>'required|max:255',
             'remark'=>'required|max:255',
-            'alias'=>'required|max:10|unique:gl_blog_category,alias',
+            'alias'=>'required|max:10|unique:gl_blog_category',
         ];
         ];
     }
     }
 
 
@@ -37,8 +37,8 @@ class BlogCategoryRequest extends FormRequest
             'name.max'=>'名称最大100字',
             'name.max'=>'名称最大100字',
             'remark.required'=>'请填写简介',
             'remark.required'=>'请填写简介',
             'remark.max'=>'简介最大255字',
             'remark.max'=>'简介最大255字',
-            'remark.required'=>'请填写别名',
-            'remark.max'=>'别名最大10字',
+            'alias.required'=>'请填写别名',
+            'alias.max'=>'别名最大10字',
         ];
         ];
     }
     }
 }
 }