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

kaiyu

2021-03-25 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe

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

@@ -130,6 +130,11 @@
      - /organization/update
      - /organization/delete

      - /role/getAllManageRole
      - /role/getManageRoleByNameFuzzy
      - /role/updateRoleMenu
      - /menu/getAllManageMenu
      - /menu/getManageMenuByNameFuzzy
AES:
  KEY:
    AD42F7787B035B7580000EF93BE20BAD