Merge branch 'new-indicators' into 'es23-superior-education-conclusion-tax'
# Conflicts: # src/libs/routes_v1/api.js
Showing
- docker-compose.yml 11 additions, 0 deletionsdocker-compose.yml
- entrypoint.sh 5 additions, 0 deletionsentrypoint.sh
- gulpfile.babel.js 7 additions, 15 deletionsgulpfile.babel.js
- gulpfile.template.js 20 additions, 0 deletionsgulpfile.template.js
- 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/educationDegreeEntity.js 32 additions, 0 deletionssrc/libs/convert/educationDegreeEntity.js
- src/libs/convert/educationLevelBasic.js 3 additions, 3 deletionssrc/libs/convert/educationLevelBasic.js
- src/libs/convert/educationLevelModAgg.js 2 additions, 0 deletionssrc/libs/convert/educationLevelModAgg.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/incomeRange.js 2 additions, 0 deletionssrc/libs/convert/incomeRange.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/convert/totalDoc.js 23 additions, 0 deletionssrc/libs/convert/totalDoc.js
- src/libs/middlewares/aggregateData.js 26 additions, 2 deletionssrc/libs/middlewares/aggregateData.js
- src/libs/middlewares/id2str.js 24 additions, 3 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 14 additions, 1 deletionsrc/libs/routes_v1/api.js
- src/libs/routes_v1/basicEducationConclusion.js 620 additions, 0 deletionssrc/libs/routes_v1/basicEducationConclusion.js
Loading
Please register or sign in to comment