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

648540858

2022-07-19 4765f9b9f2b70ba60b847e819dc5686e3bf23ed7

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

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

     */

    public static Object getBean(String beanId) throws BeansException {

        if (applicationContext == null) return null;

        if (applicationContext == null) {

            return null;

        }

        return applicationContext.getBean(beanId);

    }