Merge branch 'new-indicators' into 'es23-students-receiving-aid-tax'
# Conflicts: # src/libs/routes_v1/api.js
Showing
- src/libs/convert/incomeRange.js 2 additions, 0 deletionssrc/libs/convert/incomeRange.js
- src/libs/middlewares/id2str.js 1 addition, 0 deletionssrc/libs/middlewares/id2str.js
- src/libs/routes_v1/aggregateClass.js 50 additions, 0 deletionssrc/libs/routes_v1/aggregateClass.js
- src/libs/routes_v1/api.js 15 additions, 1 deletionsrc/libs/routes_v1/api.js
- src/libs/routes_v1/basicEducationConclusion.js 620 additions, 0 deletionssrc/libs/routes_v1/basicEducationConclusion.js
- src/libs/routes_v1/city.js 1 addition, 0 deletionssrc/libs/routes_v1/city.js
- src/libs/routes_v1/iliteracyRate.js 613 additions, 0 deletionssrc/libs/routes_v1/iliteracyRate.js
- src/libs/routes_v1/instructionLevel.js 252 additions, 0 deletionssrc/libs/routes_v1/instructionLevel.js
- src/libs/routes_v1/superiorEducationConclusionTax.js 621 additions, 0 deletionssrc/libs/routes_v1/superiorEducationConclusionTax.js
Loading
Please register or sign in to comment