Merge branch 'xinyan' into dev

src/views/sku-manage/product-attribute/component/CreateDialog.vue

@@ -67,7 +67,7 @@ const resetForm = (formEl: FormInstance | undefined) => {
 </script>
 
 <template>
-	<el-dialog ref="createDialog" v-model="createOpen" :close-on-click-modal="false" :close-on-press-escape="false" :title="`产品品牌 - 创建 `" style="width: 30%">
+	<el-dialog ref="createDialog" v-model="createOpen" :close-on-click-modal="false" :close-on-press-escape="false" :title="`产品属性 - 创建 `" style="width: 30%">
 		<el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" class="mx-2.5 mt-5" label-width="auto" status-icon>
 					<el-form-item class="font-medium" label="属性名称" prop="name">
 						<el-input v-model="ruleForm.name" placeholder="请输入属性名称" style="width:328px"/>

src/views/sku-manage/product-category/component/CreateDialog.vue

@@ -63,7 +63,7 @@ const resetForm = (formEl: FormInstance | undefined) => {
 </script>
 
 <template>
-	<el-dialog ref="createDialog" v-model="createOpen" :close-on-click-modal="false" :close-on-press-escape="false" :title="`产品品牌 - 创建 `" style="width: 30%">
+	<el-dialog ref="createDialog" v-model="createOpen" :close-on-click-modal="false" :close-on-press-escape="false" :title="`产品种类 - 创建 `" style="width: 30%">
 		<el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" class="mx-2.5 mt-5" label-width="auto" status-icon>
 					<el-form-item class="font-medium" label="种类名称" prop="name">
 						<el-input v-model="ruleForm.name" placeholder="请输入种类名称" style="width:328px"/>