Merge remote-tracking branch 'origin/master'

jinpengyong

2020-06-03 4f3fd6c40cf8ff706f86363ccd6555164f348d63

 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);