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/model/ExpressGroup.kt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/example/firstapp/model/ExpressGroup.kt b/app/src/main/java/com/example/firstapp/model/ExpressGroup.kt
index 994245a..82a23c5 100644
--- a/app/src/main/java/com/example/firstapp/model/ExpressGroup.kt
+++ b/app/src/main/java/com/example/firstapp/model/ExpressGroup.kt
@@ -6,8 +6,8 @@
 )
 
 data class ExpressPackage(
-//    var id: Long,
+    var id: Long,
     val company: String,
     val trackingNumber: String,
-    val date: String
+    val createTime: String
 ) 
\ No newline at end of file

--
Gitblit v1.9.3