update data adapter and order
update order
Revert "update data adapter and order"

This reverts commit 79953bed94ed38032caf7c43deb3ebab9e8ab15d.