From 93775e1f3d79a1e11b839abbf24201dafcd9e646 Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期五, 25 四月 2025 13:45:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 app/src/main/java/com/example/firstapp/database/entity/Code.kt |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/example/firstapp/database/entity/Code.kt b/app/src/main/java/com/example/firstapp/database/entity/Code.kt
index ac1f130..3dbfea4 100644
--- a/app/src/main/java/com/example/firstapp/database/entity/Code.kt
+++ b/app/src/main/java/com/example/firstapp/database/entity/Code.kt
@@ -9,13 +9,18 @@
     @PrimaryKey(autoGenerate = true) val id: Long = 0, // 自增长的 id
     val category: String,
     val categoryId: Long,
-    val type: String,
     val typeId: Long,
     val ruleId: Long,
     val msgId: Long,
-    val code: String,
-    var overtime: String,
-    var name: String,
+    var createTime: String,
+    val oneLevel: String,     //type改成oneLevel
+    var secondLevel: String,  //name改成secondLevel
+    val code: String,         //快递对应取件码、还款对应金额
+    var pickup: Int,          //快递取件状态
+    var pickupTime: String,   //快递取件时间
+    var overTime: String,     //快递超期时间、还款日期
+    var address: String,      //地址信息
+    var remarks: String,      //备注信息保存
+    var smsTimestamp: Long = 0,  // 新增短信时间戳字段
     var time: Date = Date(),
-
 )

--
Gitblit v1.9.3