Merge branch 'development' into 'homologa'

dev -> hom

See merge request !484

src/libs/middlewares/aggregateData.js

@@ -72,7 +72,7 @@ function aggregateData(req, res, next) {
             'receita_potencial',
             'despesas'
         ];
-        const baseFields = ["school"]
+        const baseFields = ["school", "city"]
         let id;
         const fields = req.query.dims.split(',');
         let currentAggregateField;

src/libs/routes_v1/enrollmentAggregate.js

@@ -400,7 +400,8 @@ rqf.addField({
     where: {
         relation: '=',
         type: 'integer',
-        field: 'id'
+        field: 'municipio_id',
+        table: 'escola'
     },
     join: {
         primary: 'id',