diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcCheckInPage.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcCheckInPage.kt index b00e365..22d38a8 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcCheckInPage.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcCheckInPage.kt @@ -7,7 +7,7 @@ package com.lukouguoji.module_base.bean data class GjcCheckInPage( var fdate: String? = null, // 航班日期 var fno: String? = null, // 航班号 - var no: String? = null, // 运单号 + var whNo: String? = null, // 运单号 var hno: String? = null, // 分单号 var pageNum: Int = 1, // 页码 var pageSize: Int = 10 // 每页条数 diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt index ddc3b9e..bd14d40 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpLoadViewModel.kt @@ -189,7 +189,7 @@ class IntExpLoadViewModel : BasePageViewModel() { val pageParams = GjcCheckInPage( fdate = flightDate.value?.ifEmpty { null }, fno = flightNo.value?.ifEmpty { null }, - no = waybillNo.value?.ifEmpty { null }, + whNo = waybillNo.value?.ifEmpty { null }, pageNum = pageModel.page, pageSize = pageModel.limit ) @@ -201,7 +201,7 @@ class IntExpLoadViewModel : BasePageViewModel() { val totalParams = GjcCheckInPage( fdate = flightDate.value?.ifEmpty { null }, fno = flightNo.value?.ifEmpty { null }, - no = waybillNo.value?.ifEmpty { null } + whNo = waybillNo.value?.ifEmpty { null } ).toRequestBody() // 获取列表 (带Loading) diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt index e1d601e..1d4af55 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/IntExpTallyViewModel.kt @@ -224,7 +224,7 @@ class IntExpTallyViewModel : BasePageViewModel() { val pageParams = GjcCheckInPage( fdate = flightDate.value?.ifEmpty { null }, fno = flightNo.value?.ifEmpty { null }, - no = waybillNo.value?.ifEmpty { null }, + whNo = waybillNo.value?.ifEmpty { null }, hno = houseWaybillNo.value?.ifEmpty { null }, pageNum = pageModel.page, pageSize = pageModel.limit @@ -237,7 +237,7 @@ class IntExpTallyViewModel : BasePageViewModel() { val totalParams = GjcCheckInPage( fdate = flightDate.value?.ifEmpty { null }, fno = flightNo.value?.ifEmpty { null }, - no = waybillNo.value?.ifEmpty { null }, + whNo = waybillNo.value?.ifEmpty { null }, hno = houseWaybillNo.value?.ifEmpty { null } ).toRequestBody()