Merge branch 'development' into 'courseAggregate'
# Conflicts: # src/libs/routes_v1/api.js
Showing
- src/libs/convert/ageRangeEntity.js 40 additions, 0 deletionssrc/libs/convert/ageRangeEntity.js
- src/libs/convert/diffLocation.js 2 additions, 0 deletionssrc/libs/convert/diffLocation.js
- src/libs/convert/educationLevelModEntityAgg.js 56 additions, 0 deletionssrc/libs/convert/educationLevelModEntityAgg.js
- src/libs/convert/educationLevelModEntitySeg.js 40 additions, 0 deletionssrc/libs/convert/educationLevelModEntitySeg.js
- src/libs/convert/postGraduationEntity.js 32 additions, 0 deletionssrc/libs/convert/postGraduationEntity.js
- src/libs/convert/specialEducationEntity.js 31 additions, 0 deletionssrc/libs/convert/specialEducationEntity.js
- src/libs/middlewares/aggregateData.js 22 additions, 2 deletionssrc/libs/middlewares/aggregateData.js
- src/libs/middlewares/id2str.js 17 additions, 3 deletionssrc/libs/middlewares/id2str.js
- src/libs/routes_v1/api.js 3 additions, 0 deletionssrc/libs/routes_v1/api.js
- src/libs/routes_v1/enrollmentAggregate.js 2 additions, 2 deletionssrc/libs/routes_v1/enrollmentAggregate.js
- src/libs/routes_v1/federativeEntity.js 587 additions, 0 deletionssrc/libs/routes_v1/federativeEntity.js
- src/libs/routes_v1/rateSchoolNew.js 41 additions, 12 deletionssrc/libs/routes_v1/rateSchoolNew.js
- src/libs/routes_v1/universityLocalOffer.js 1 addition, 1 deletionsrc/libs/routes_v1/universityLocalOffer.js
Loading
Please register or sign in to comment