[development]Merge fix

src/libs/routes/api.js

@@ -102,10 +102,7 @@ api.use('/distribution_factor', distributionFactor);
 api.use('/siope', siope);
 api.use('/out_of_school', outOfSchool);
 api.use('/classroom_count', classroomCount);
-<<<<<<< HEAD
 api.use('/dailyChargeAmount', dailyChargeAmount);
-=======
 api.use('/transport', transport);
->>>>>>> development
 
 module.exports = api;