From 32d56327d6f69373ada1c3447f542ec1a39282b1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 06 五月 2024 17:31:01 +0800
Subject: [PATCH] 合并冲突

---
 src/components/tool/excel.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/tool/excel.vue b/src/components/tool/excel.vue
index eeb1f26..2c4027e 100644
--- a/src/components/tool/excel.vue
+++ b/src/components/tool/excel.vue
@@ -89,10 +89,10 @@
 					dataVerification: false, // '鏁版嵁楠岃瘉'
 					frozenMode: false, // '鍐荤粨鏂瑰紡'
 					currencyFormat: false, //璐у竵鏍煎紡
-					percentageFormat: false, //鐧惧垎姣旀牸寮�
+					percentageFormat: true, //鐧惧垎姣旀牸寮�
 					numberDecrease: true, // '鍑忓皯灏忔暟浣嶆暟'
 					numberIncrease: true, // '澧炲姞灏忔暟浣嶆暟
-					moreFormats: false, // '鏇村鏍煎紡'
+					moreFormats: true, // '鏇村鏍煎紡'
 					strikethrough: false, // '鍒犻櫎绾� (Alt+Shift+5)'
 					underline: false, // '涓嬪垝绾� (Alt+Shift+6)'
 					italic: false, // '鏂滀綋 (Ctrl+I)'

--
Gitblit v1.9.3