Merge branches 'dev' and 'pingyin_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master

epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml

@@ -36,7 +36,7 @@ spring:
       url: @datasource.druid.stats.url@
       username: @datasource.druid.stats.username@
       password: @datasource.druid.stats.password@
-      maxActive: 60
+      max-active: 100
   cloud:
     nacos:
       discovery:
@@ -182,7 +182,7 @@ dynamic:
       url: @datasource.druid.evaluationIndex.url@
       username: @datasource.druid.evaluationIndex.username@
       password: @datasource.druid.evaluationIndex.password@
-      maxActive: 50
+      max-active: 100
     partyMember:
       driver-class-name: com.mysql.cj.jdbc.Driver
       url: @datasource.druid.partyMember.url@