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

lizijie

2021-03-18 f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243

 screen-manage/src/main/resources/application-dev.yml

@@ -121,6 +121,8 @@
      - /account/insert
      - /account/query
      - /account/update
      - /account/delete
      - /account/yanzhengma
AES:
  KEY:
    AD42F7787B035B7580000EF93BE20BAD