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

kaiyu

2021-05-13 e05adb8da62b72798fe273454d51bb36b2ee72de

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

@@ -123,6 +123,7 @@
      - /manageMenu/**
      - /api/**
      - /sensor/**
      - /monitorPoint/**
AES:
  KEY:
    AD42F7787B035B7580000EF93BE20BAD