Merge branch 'master' of http://git.minpay.cc/SupplyChain/front

# Conflicts:
#	front-vue/src/views/workDeal.vue