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

疯狂的狮子li

2021-11-24 c364836a9d32bb6ec7eab8185da244228a55d24c

 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;