Merge branch 'feature-content7' into 'master'

holo超时配置

See merge request !1690

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/content/holo/HoloDataSource.java

@@ -32,6 +32,7 @@ public class HoloDataSource implements InitializingBean, DisposableBean {
             holoConfig.setJdbcUrl(holoUrl);
             holoConfig.setUsername(holoUserName);
             holoConfig.setPassword(holoPassword);
+            holoConfig.setConnectionMaxIdleMs(13000);
             this.client = new HoloClient(holoConfig);
             this.client.setAsyncCommit(false);
             log.info("holo链接初始化完成");