dto-base
fix conflict
Merge branch 'master' of https://github.com/cjjlovecjj/dto-base