From 70bf5f310d85c3a0700d75a7a877f5a1e403d83f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 28 三月 2024 09:09:51 +0800
Subject: [PATCH] 合并冲突
---
package.json | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/package.json b/package.json
index 5a0442f..fb17cee 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
"build": "node build/build.js"
},
"dependencies": {
+ "@tinymce/tinymce-vue": "^3.2.8",
"@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
"@vue/babel-preset-jsx": "^1.2.4",
"@wangeditor/editor": "^5.1.23",
@@ -35,6 +36,7 @@
"popper.js": "^1.16.1",
"qs": "^6.11.0",
"sweetalert": "^2.1.2",
+ "tinymce": "^5.10.3",
"v-fit-columns": "^0.2.0",
"vant": "^2.12.54",
"view-design": "^4.6.1",
--
Gitblit v1.9.3