Merge branch 'xinyan' into dev

src/views/product-manage/product-list/component/DataTable.vue

@@ -194,8 +194,6 @@ defineExpose({ fetchList });
           商品导入
         </ImportButton>
         <ImportButton :icon="Money" bg text :uploadFunction="api.uploadPrice">指导价格导入</ImportButton>
-				<div slot="tip" class="el-upload__tip" style="color:red">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
-
       </div>
     </template>
     <!-- 工具栏右侧 -->