From dde2eeddbaf07246da7c2c352e7d49ec63fddcd2 Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期五, 28 三月 2025 14:56:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/com/example/firstapp/activity/PickupActivity.kt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/activity/PickupActivity.kt b/app/src/main/java/com/example/firstapp/activity/PickupActivity.kt
index 2ba9cd2..d7dda6d 100644
--- a/app/src/main/java/com/example/firstapp/activity/PickupActivity.kt
+++ b/app/src/main/java/com/example/firstapp/activity/PickupActivity.kt
@@ -104,9 +104,9 @@
val packages = codes.map { code ->
ExpressPackage(
id = code.id,
- company = code.name ?: company,
+ company = code.secondLevel ?: company,
trackingNumber = code.code,
- createTime = code.createtime
+ createTime = code.createTime
)
}
--
Gitblit v1.9.3