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

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java

@@ -306,7 +306,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
      */
     @Override
     public List<ScreenProjectDataDTO> getProjectList(String customerId, List<String> projectId, Integer pageNo, Integer pageSize) {
-        PageHelper.startPage(pageNo, pageSize);
+        PageHelper.startPage(pageNo, pageSize, false);
         return baseDao.selectProjectList(customerId, projectId);
     }
 

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

@@ -36,6 +36,7 @@ spring:
       url: @datasource.druid.stats.url@
       username: @datasource.druid.stats.username@
       password: @datasource.druid.stats.password@
+      maxActive: 50
   cloud:
     nacos:
       discovery: