From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken

---
 ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java b/ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java
index d7b8dbe..f2c755a 100644
--- a/ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java
+++ b/ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java
@@ -13,6 +13,8 @@
 @ConfigurationProperties(prefix = "xxl.job")
 public class XxlJobProperties {
 
+    private Boolean enabled;
+
     private String adminAddresses;
 
     private String accessToken;

--
Gitblit v1.9.3