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

648540858

2023-04-13 cef04a8b5acdbe1d086fdc45d6c4a5b3b8df4a51

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

@@ -33,11 +33,11 @@
    /**

     * 获取对象 这里重写了bean方法，起主要作用

     */

    public static Object getBean(String beanId) throws BeansException {

    public static  <T> T getBean(String beanId) throws BeansException {

        if (applicationContext == null) {

            return null;

        }

        return applicationContext.getBean(beanId);

        return (T) applicationContext.getBean(beanId);

    }



    /**