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

疯狂的狮子li

2021-12-22 b6442b4640fd94b812419263b03c9ce5e2371c9a

 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;