fixed view edit barang admin
merge