From 7a5c5250b66cc6faffbcac9e192073473c50f79f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 28 八月 2026 17:02:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/hrm/employee/modules/import-form.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/hrm/employee/modules/import-form.vue b/src/views/hrm/employee/modules/import-form.vue
index 1940064..790d0da 100644
--- a/src/views/hrm/employee/modules/import-form.vue
+++ b/src/views/hrm/employee/modules/import-form.vue
@@ -113,7 +113,7 @@
<Switch v-model:checked="updateSupport" />
</div>
<div class="mt-2 text-gray-500">
- 浠呭厑璁稿鍏� xls銆亁lsx 鏍煎紡鏂囦欢锛涙ā鏉夸腑"閮ㄩ棬鍚嶇О/宀椾綅鍚嶇О/鐢ㄦ埛瑙掕壊"濉啓鍚嶇О锛岃鑹插涓敤閫楀彿鍒嗛殧
+ 浠呭厑璁稿鍏� xls銆亁lsx 鏍煎紡鏂囦欢锛涙ā鏉夸腑"閮ㄩ棬鍚嶇О/宀椾綅鍚嶇О/鐢ㄦ埛瑙掕壊"濉啓鍚嶇О锛屽矖浣嶅拰瑙掕壊澶氫釜鐢ㄩ�楀彿鍒嗛殧
</div>
<!-- 瀵煎叆杩涘害鏉� -->
<div v-if="importing" class="mt-4">
--
Gitblit v1.9.3