From a69578ed877252e70d45d4753258b3d7b6937606 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:24:34 +0800
Subject: [PATCH] a

---
 server/src/main/java/doumeemes/config/shiro/ShiroToken.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/server/src/main/java/doumeemes/config/shiro/ShiroToken.java b/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
index 14b3889..cdc6b69 100644
--- a/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
+++ b/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
@@ -1,6 +1,9 @@
 package doumeemes.config.shiro;
 
+<<<<<<< HEAD
 import doumeemes.core.model.LoginUserInfo;
+=======
+>>>>>>> 1.0.3
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.springframework.stereotype.Component;
 

--
Gitblit v1.9.3