From 56eba9cded865648465bc2c5815d47441e0457b1 Mon Sep 17 00:00:00 2001
From: sxq <812980466@qq.com>
Date: 星期二, 22 六月 2021 15:35:52 +0800
Subject: [PATCH] Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts.
---
ruoyi-ui/src/views/index.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 5f487c9..d16cf12 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -53,7 +53,7 @@
<li>JWT</li>
<li>MyBatis</li>
<li>Druid</li>
- <li>Fastjson</li>
+ <li>Jackson</li>
<li>...</li>
</ul>
</el-col>
--
Gitblit v1.9.3