Merge remote-tracking branch 'remotes/origin/dev'

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/CustomerApplicationRunner.java

@@ -40,6 +40,7 @@ public class CustomerApplicationRunner implements ApplicationRunner {
     public void run(ApplicationArguments args) {
         //发送启动成功消息
         EnvEnum currentEnv = EnvEnum.getCurrentEnv();
+        logger.info(currentEnv);
         if (!EnvEnum.DEV.getCode().equals(currentEnv.getCode())) {
             InetUtils inetUtils = SpringContextUtils.getBean(InetUtils.class);
             String serverIp = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.2__dim_ag_add_col_type.sql

@@ -1 +1,2 @@
-ALTER TABLE dim_agency ADD COLUMN AGENCY_DIM_TYPE VARCHAR(10) NOT NULL COMMENT '机关维度类型。self:机关本身自己,all:机关自己+下级+网格+部门等';
+/*ALTER TABLE dim_agency ADD COLUMN AGENCY_DIM_TYPE VARCHAR(10) NOT NULL COMMENT '机关维度类型。self:机关本身自己,all:机关自己+下级+网格+部门等';*/
+select 1;