Table DAO

1231
fix conflict
fix error DAO
fix conflict Users
fix conflict