fix query in res admin report, add staff, add manager frontend and backend
resolve conflict