From 0de6edd66b21331abbb2513ee5b0b8013fea03df Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 19 四月 2024 10:22:02 +0800
Subject: [PATCH] 合并冲突
---
package.json | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package.json b/package.json
index fb17cee..5e1b7c1 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
"layui": "^2.6.8",
"luckyexcel": "^1.0.1",
"luckysheet": "^2.1.13",
+ "mammoth": "^1.7.1",
"muse-ui": "^3.0.2",
"node-emoji": "^1.11.0",
"popper.js": "^1.16.1",
--
Gitblit v1.9.3