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

@@ -26,7 +26,7 @@ class BlogCategoryRequest extends FormRequest
         return [
             'name'=>'required|max:100',
             'remark'=>'required|max:255',
-            'alias'=>'required|max:10|unique:gl_blog_category',
+            'alias'=>'required|max:10',
         ];
     }
 

@@ -26,7 +26,7 @@ class NewsCategoryRequest extends FormRequest
         return [
             'name'=>'required|max:100',
             'remark'=>'required|max:255',
-            'alias'=>'required|max:10|unique:gl_news_category',
+            'alias'=>'required|max:10',
         ];
     }
 

@@ -130,6 +130,9 @@ class Base extends Model
      * @method post
      */
     public function edit($data,$condition){
+        if(isset($data['id']) && !empty($data['id'])){
+            unset($data['id']);
+        }
         $query = $this->formatQuery($condition);
         $data['updated_at'] = date('Y-m-d H:i:s');
         return $query->update($data);