Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts.

sxq

2021-06-11 56eba9cded865648465bc2c5815d47441e0457b1

 ruoyi-admin/src/main/resources/application.yml

@@ -15,7 +15,7 @@

captcha:
  # 验证码开关
  enabled: true
  enabled: false
  # 验证码类型 math 数组计算 char 字符验证
  type: math
  # line 线段干扰 circle 圆圈干扰 shear 扭曲干扰
@@ -253,7 +253,7 @@
      enabled: true
  okhttp:
    enabled: true
  hystrix:
  circuitbreaker:
    enabled: true

--- # 定时任务配置