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/database/entity/Code.kt | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 40a1ac5..93d0e8a 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,15 +9,17 @@
@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 createtime: String,
- var name: String,
- var pickup: Int,
- var pickuptime: String, //取件时间
- var overtime: 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 time: Date = Date(),
)
--
Gitblit v1.9.3