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

jinpengyong

2021-06-23 6f12948893fcc846dfb32aa861c473a842edcd56

 screen-manage/src/main/java/com/moral/api/controller/TestController.java

@@ -182,9 +182,4 @@
        writer.close();
        fis.close();
    }

    @GetMapping("testCacheUtils")
    public void testCacheUtils(){
        CacheUtils.flushDeviceAlarmUnit();
    }
}