From 1c84565d624ad0cce0576a22d0323cf3181d49cd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 13:56:28 +0800
Subject: [PATCH] Merge branch 'dev'

---
 server/src/main/java/doumeemes/config/shiro/ShiroToken.java |    7 +++++++
 1 files changed, 7 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..558ab19 100644
--- a/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
+++ b/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
@@ -1,6 +1,13 @@
 package doumeemes.config.shiro;
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 import doumeemes.core.model.LoginUserInfo;
+=======
+>>>>>>> 1.0.3
+=======
+import doumeemes.core.model.LoginUserInfo;
+>>>>>>> dev
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.springframework.stereotype.Component;
 

--
Gitblit v1.9.3