From a46f5f1db19dc1af644a4ed013bb12555621e135 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 21 May 2020 14:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/config/XxlJobConfig.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/config/XxlJobConfig.java b/src/main/java/com/moral/config/XxlJobConfig.java
index 3f578b3..ceb17fe 100644
--- a/src/main/java/com/moral/config/XxlJobConfig.java
+++ b/src/main/java/com/moral/config/XxlJobConfig.java
@@ -12,7 +12,7 @@
  *
  * @author xuxueli 2017-04-28
  */
-//@Configuration
+@Configuration
 public class XxlJobConfig {
     private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
 

--
Gitblit v1.8.0