DAO modify
Merge branch 'HEAD' of https://github.com/02356013/EricJ into HEAD