Merge branch 'ol_12_30' into test

src/views/businessManager/orderManager/financeManager-taoqi.vue

@@ -923,7 +923,7 @@ export default {
         balancePaymentAmount: searchForm.balancePaymentAmount,
         paymentStatus: searchForm.paymentStatus,
         paymentType: searchForm.paymentType,
-        organId: searchForm.organId,
+        routingOrganId: searchForm.routingOrganId,
         lessBalancePaymentAmount: searchForm.lessBalancePaymentAmount,
         lessActualAmount: searchForm.lessActualAmount,
         ...this.extraQuery,

src/views/businessManager/orderManager/financeManager.vue

@@ -925,7 +925,7 @@ export default {
         balancePaymentAmount: searchForm.balancePaymentAmount,
         paymentStatus: searchForm.paymentStatus,
         paymentType: searchForm.paymentType,
-        organId: searchForm.organId,
+        routingOrganId: searchForm.routingOrganId,
         lessBalancePaymentAmount: searchForm.lessBalancePaymentAmount,
         lessActualAmount: searchForm.lessActualAmount,
         ...this.extraQuery,