fix dao
edit
Merge branch 'master' of https://github.com/zadbee/ZyxtTask7