Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

panlinlin

2021-01-07 059a5a678ab21738c3fecb9e2bd1e2dc47220a4f

 src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java

@@ -25,6 +25,7 @@

    @Autowired
    private IVideoManagerStorager storager;

    @Autowired
    private IRedisCatchStorage redisCatchStorage;