add demandId to key in demand_all view
merge