Conflicts:

	env/env.js

	pages/apply/paymentTemplate/add/add.js

	pages/apply/paymentTemplate/add/add.json

	pages/apply/paymentTemplate/add/add.wxml

	utils/API.js

# Conflicts:
#	env/env.js
#	utils/API.js

# Conflicts:
#	app.json
#	env/env.js
#	pages/apply/index.wxml
#	pages/index/index.js
#	pages/user/login/login.js
#	project.config.json
#	utils/API.js

# Conflicts:
#	app.json

Conflicts:
	app.json
	project.config.json