Merge remote-tracking branch 'origin/master_huangjunjie'

# Conflicts:
#	jshERP-web/src/views/system/modules/userSupplierModal.vue
#	src/main/resources/mapper_xml/DepotHeadMapper.xml