Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2021-12-20 673b225da2cae462b98c180a76b50e369e23a964

 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;