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

bingbing

2020-10-27 1d5345f92dbd4aac2b5f68265921bb2529a71b8e

 kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml

@@ -56,7 +56,7 @@
  security:
    code:
      # 忽略验证码的应用编号
      ignoreClientCode: app,hospital,webApp,readxapp
      ignoreClientCode: app,hospital,readxapp

encrypt:
  key-store: