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/api/login.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js
index 9ddd1c1..869cd9f 100644
--- a/ruoyi-ui/src/api/login.js
+++ b/ruoyi-ui/src/api/login.js
@@ -37,4 +37,4 @@
url: '/captchaImage',
method: 'get'
})
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3