change dao class
fix mege conflict and add dao class