wangyu / naturalPersonTax · 提交

# Conflicts:
#	pages/main/advancepayment/adPayHome.js
#	project.config.json

# Conflicts:
#	app.js
#	pages/main/advancepayment/adPayHome.js

# Conflicts:
#	app.js
#	app.json
#	pages/main/advancepayment/adPayHome.js
#	pages/main/guide/guide.js
#	pages/main/guide/guide.wxml

# Conflicts:
#	pages/main/advancepayment/adPayHome.js

# Conflicts:
#	app.js
#	pages/getPhone/getPhone.json
#	pages/login/login.json
#	pages/main/guide/guide.json
#	project.config.json

证照改版 工资条字段

# Conflicts:
#	pages/main/advancepayment/adPayHome.js