wangyu / naturalPersonTax · 提交

# Conflicts:
#	app.js
#	pages/getPhone/getPhone.json
#	pages/login/login.json
#	pages/main/guide/guide.json
#	pages/main/taxperson/home.json

# Conflicts:
#	app.js
#	project.config.json

# Conflicts:
#	pages/main/taxperson/home.js

# Conflicts:
#	app.js