Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-11-17 81d04fb31f234409229b9e96b5329020cd499f25

 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;