Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat

# Conflicts:
#	iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/collection/PlanItemCollector.java

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/collection/PlanItemCollector.java

@@ -85,7 +85,9 @@
            return null;
        }
        Map<String, Object> params = getSqlParams(dataSet, startTime, endTime);
        // 过滤sql注入
        SQLFilter.sqlInject2(dataSet.getQuerySql());
        // 切换数据源
        DataContextHolder.setDataSourceId(Long.valueOf(dataSet.getDataSource()));
        return planItemService.getSourceValue(params);
    }