Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-05-11 39c6e9b5e6006053d42c0c8d4dc777add9257ae6

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

@@ -122,6 +122,7 @@
      - /manageRole/**
      - /manageMenu/**
      - /api/**
      - /sensor/**
AES:
  KEY:
    AD42F7787B035B7580000EF93BE20BAD