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-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
index 7b5d951..2c65ac6 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
@@ -19,7 +19,7 @@
 import java.util.List;
 
 /**
- * Swagger2鐨勬帴鍙ｉ厤缃�
+ * Swagger 鏂囨。閰嶇疆
  *
  * @author Lion Li
  */

--
Gitblit v1.9.3