Merge remote-tracking branch 'origin/master' into master

648540858

2020-11-09 2e9b4b4e5e86c84088c45563cd61d18d8c7e5fea

 src/main/java/com/genersoft/iot/vmp/conf/VManagerConfig.java

@@ -14,14 +14,12 @@
   @Value("${spring.application.database:redis}")

    private String database;



   public String getDatabase() {

      return database;

   }



   public void setDatabase(String database) {

      this.database = database;

   }

    public String getDatabase() {

        return database;

    }





	
    public void setDatabase(String database) {

        this.database = database;

    }

}