changed BasicDAO
Merge branch 'master' of https://github.com/Bo0mer/finna-be-octo-avenger