Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-12-23 5bd5f3bcd6d2cb375feb0756505691b551339716

 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigIncidentManage.java

@@ -46,7 +46,7 @@
            throws Exception
    {
        MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
        factoryBean.setDataSource(dataSource);
        factoryBean.setDataSource(dsIncidentManage);
        ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();

        //-------------------