From acea9131318ee6823d008b386e52fee573882b2e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 18 十二月 2023 15:14:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
index 1ba37af..84a37de 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
@@ -85,7 +85,6 @@
         String password = AesEncryptUtil.desEncrypt(umsAdminLoginParam.getPassword());
 //        String password = umsAdminLoginParam.getPassword();
         String token = adminService.login(umsAdminLoginParam.getUsername(), password);
-
         if (token == null) {
             return CommonResult.validateFailed("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
         }

--
Gitblit v1.8.0