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

panlinlin

2021-01-13 9e09755ef054d6455e94ed4a68d60f231d8e944a

 src/main/java/com/genersoft/iot/vmp/utils/SpringBeanFactory.java

@@ -34,6 +34,7 @@
     * 获取对象 这里重写了bean方法，起主要作用

     */

    public static Object getBean(String beanId) throws BeansException {

        if (applicationContext == null) return null;

        return applicationContext.getBean(beanId);

    }