From c01bcaf0b60fd5c57786ba31f3d6e9d411e0c5ed Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期日, 09 十月 2022 13:57:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/controller/UserController.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index ecb58f8..8e80ef0 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -109,7 +109,6 @@
         }
 
         String token = tokenManager.getTokenByUserId(user.getUserId());
-//        String token = tokenManager.createToken(user.getUserId(), user.getRoleId());
         System.out.println("token "+token);
         if (token == null) {
             //生成一个token,保存用户登录状态

--
Gitblit v1.7.1