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

panlinlin

2021-01-11 8b4d8a76acf3a699744caeda8ca6f0268136727e

 src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java

@@ -11,5 +11,4 @@
   public static void main(String[] args) {

      SpringApplication.run(VManageBootstrap.class, args);

   }



}