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

疯狂的狮子Li

2021-11-21 b9b1ec8f4163bab66cf22bba784bf48b72167e76

 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 {