Merge branch 'dev'

epmet-module/data-aggregator/data-aggregator-server/pom.xml

@@ -447,7 +447,7 @@
                 <datasource.druid.stats.url>
                     <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.stats.url>
-                <datasource.druid.stats.username>epmet_data_statistical_user</datasource.druid.stats.username>
+                <datasource.druid.stats.username>epmet_data_statistical</datasource.druid.stats.username>
                 <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
 
                 <!-- epmet_evaluation_index -->