From 6e15ba36ab0a264b7c3a038edaf01abbdc71e54b Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 02 九月 2025 11:29:23 +0800
Subject: [PATCH] 合并冲突掉的代码
---
package.json | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package.json b/package.json
index d6169e8..dfb3cec 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "ruoyi",
"version": "3.8.9",
- "description": "涓皬浼佷笟鏁板瓧鍖栬浆鍨嬪椁愬寘",
+ "description": "涓己鎭掑叴绠＄悊绯荤粺",
"author": "鑻ヤ緷",
"license": "MIT",
"type": "module",
--
Gitblit v1.9.3