add WishModel
Merge branch 'dev-lzt' into develop