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

疯狂的狮子li

2022-01-04 92653f3deb3f0f03ee9bfef3e9322fb94c90938c

 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;