Merge remote-tracking branch 'origin/master' into feature/bfi-api-rate

# Conflicts:
#	src/views/vehicle/customer-archive.vue

src/api/payment/paymentApplication.js

@@ -26,7 +26,7 @@ export const syncKingdeeResult = () =>
 export const paymentTypeOptions = [
   { label: '项目预付', value: 'project_advance' },
   { label: '进度预付', value: 'progress_advance' },
-  { label: '结算付款', value: 'settlement_payment' },
+  { label: '尾款付款', value: 'settlement_payment' },
 ];
 export const approvalStatusOptions = [
   { label: '草稿', value: 'draft' },