Conflicts: utils/API.js
Conflicts: pages/inCome/inCome.wxml
Conflicts: env/env.js
# Conflicts: # env/env.js
# Conflicts: # pages/index/index.wxml
# Conflicts: # utils/API.js
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