From cd0252da419d4065e322b945da2d836796bc0e1f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 11:23:46 +0800
Subject: [PATCH] 合并冲突

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

diff --git a/src/components/tool/excel.vue b/src/components/tool/excel.vue
index c410db2..eeb1f26 100644
--- a/src/components/tool/excel.vue
+++ b/src/components/tool/excel.vue
@@ -90,13 +90,13 @@
 					frozenMode: false, // '鍐荤粨鏂瑰紡'
 					currencyFormat: false, //璐у竵鏍煎紡
 					percentageFormat: false, //鐧惧垎姣旀牸寮�
-					numberDecrease: false, // '鍑忓皯灏忔暟浣嶆暟'
-					numberIncrease: false, // '澧炲姞灏忔暟浣嶆暟
+					numberDecrease: true, // '鍑忓皯灏忔暟浣嶆暟'
+					numberIncrease: true, // '澧炲姞灏忔暟浣嶆暟
 					moreFormats: false, // '鏇村鏍煎紡'
 					strikethrough: false, // '鍒犻櫎绾� (Alt+Shift+5)'
 					underline: false, // '涓嬪垝绾� (Alt+Shift+6)'
 					italic: false, // '鏂滀綋 (Ctrl+I)'
-					textWrapMode: false, // '鎹㈣鏂瑰紡'
+					textWrapMode: true, // '鎹㈣鏂瑰紡'
 					textRotateMode: false, // '鏂囨湰鏃嬭浆鏂瑰紡'
 					conditionalFormat: false, // '鏉′欢鏍煎紡'
 					splitColumn: false, // '鍒嗗垪'

--
Gitblit v1.9.3