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

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

src/views/payment/invoice-application-form.vue

@@ -888,7 +888,7 @@ export default {
           item.receiverName !== first.receiverName
       );
       if (incompatible) {
-        this.$message.warning('合并开票的结算单必须属于同一合同、项目、组织及收付款方');
+        this.$message.warning('合并开票的结算单必须属于同一合同');
         return;
       }
       this.form.settlements = rows.map(item => ({
@@ -1267,7 +1267,7 @@ export default {
 }
 .invoice-form-page__dialog-search {
   display: flex;
-  justify-content: flex-end;
+  justify-content: flex-start;
   gap: 8px;
   margin-bottom: 12px;
 }