Merge branch 'master' of https://gitee.com/xany/yoshop2.0-store

src/views/content/article/modules/AddForm.vue

@@ -18,7 +18,7 @@
         </a-form-item>
         <a-form-item label="文章分类" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-select
-            v-decorator="['category_id', {rules: [{required: true, message: '请选择1个商品分类'}]}]"
+            v-decorator="['category_id', {rules: [{required: true, message: '请选择1个文章分类'}]}]"
           >
             <a-select-option
               v-for="(item, index) in categoryList"

src/views/content/article/modules/EditForm.vue

@@ -18,7 +18,7 @@
         </a-form-item>
         <a-form-item label="文章分类" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-select
-            v-decorator="['category_id', {rules: [{required: true, message: '请选择1个商品分类'}]}]"
+            v-decorator="['category_id', {rules: [{required: true, message: '请选择1个文章分类'}]}]"
           >
             <a-select-option
               v-for="(item, index) in categoryList"