combine conflicts
Merge branch 'dev' of github.com:itZhy/Rich into dev
add Deal class for buy/update/pay command of estate
Merge branch 'dev' of github.com:itZhy/Rich into dev