Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-12-27 dd37247e65374dd4ef7e8e8b9212d8f29023e301

 ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java

@@ -14,7 +14,7 @@
 *
 * @author Lion Li
 */
@Slf4j(topic = "sys-user")
@Slf4j
@Component
public class ShutdownManager {