From 5a56fe238e5f51efe5221b5a376f109cda4b4b72 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 01 六月 2023 23:29:11 +0800
Subject: [PATCH] Merge branch '1.1' of http://sinata.cn:10101/gitblit/r/java/SuperSaveDriving into 1.1

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/core/common/constant/factory/ConstantFactory.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/core/common/constant/factory/ConstantFactory.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/core/common/constant/factory/ConstantFactory.java
index e1db643..260bc0e 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/core/common/constant/factory/ConstantFactory.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/core/common/constant/factory/ConstantFactory.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.supersavedriving.driver.core.common.constant.cache.Cache;
 import com.supersavedriving.driver.core.common.constant.cache.CacheKey;
+import com.supersavedriving.driver.core.log.LogObjectHolder;
 import com.supersavedriving.driver.core.common.constant.state.ManagerStatus;
 import com.supersavedriving.driver.core.common.constant.state.MenuStatus;
 import com.supersavedriving.driver.modular.system.dao.*;
 import com.supersavedriving.driver.modular.system.model.*;
-import com.supersavedriving.driver.core.log.LogObjectHolder;
+import com.supersavedriving.driver.modular.system.dao.*;
+import com.supersavedriving.driver.modular.system.model.*;
 import com.supersavedriving.driver.core.support.StrKit;
 import com.supersavedriving.driver.core.util.Convert;
 import com.supersavedriving.driver.core.util.SpringContextHolder;

--
Gitblit v1.7.1