合并代码

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/base/BaseController.java

 package org.dromara.server.base;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.server.config.YsConfig;
+
+import java.util.List;
 
 /**
  * @author hzh