added condition dao
Merge branch 'dao'