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

疯狂的狮子li

2022-01-12 5413b37d71ddbaa42dc6f1ba7b885a322b9a3871

 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;