# Conflicts: # src/views/business/outContract/index.vue
Merge branch 'feat/tax' of http://git.manong.atliangtian.com/longbiao/hr-xinruitong-ui into feat/tax
This reverts commit 02585ce1.