reconstruction ERB code, add china_city gem, add new attribute
Merge branch 'dev' of github.com:cnepaycd/QYBUser into dev