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

疯狂的狮子li

2021-12-20 673b225da2cae462b98c180a76b50e369e23a964

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

@@ -11,7 +11,7 @@
  # 获取ip地址开关
  addressEnabled: true
  # 缓存懒加载
  cacheLazy: true
  cacheLazy: false

captcha:
  # 页面 <参数设置> 可开启关闭 验证码校验