Merge branch 'xinyan' into dev

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

@@ -79,7 +79,7 @@ const resetForm = (formEl: FormInstance | undefined) => {
 		v-model="createOpen"
 		:close-on-click-modal="false"
 		:close-on-press-escape="false"
-		:title="`产品品牌 - 创建 `"
+		:title="`属性枚举 - 创建 `"
 		style="width: 30%"
 	>
 		<el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" class="mx-2.5 mt-5" label-width="auto" status-icon>

src/views/sku-manage/product-attribute/component/manage-enum/component/EditDrawer.vue

@@ -81,7 +81,7 @@ function closeDrawer() {
                v-model="editOpen"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               :title="`产品属性- 编辑 `"
+               :title="`属性枚举- 编辑 `"
                size="25%">
       <el-form
           ref="ruleFormRef"