Merge remote-tracking branch 'origin/master'

tj

3 天以前 93775e1f3d79a1e11b839abbf24201dafcd9e646

 app/src/main/java/com/example/firstapp/database/entity/Reminder.kt

@@ -3,11 +3,13 @@
import androidx.room.Entity
import androidx.room.PrimaryKey


@Entity(tableName = "reminders")
data class Reminder(
    @PrimaryKey(autoGenerate = true) val id: Long = 0,
    val type: String,
    val nickname: String,
    val keywords: String
    @PrimaryKey(autoGenerate = true)
    val id: Long = 0,
    val categoryId: Int,
    val categoryName: String,
    val notificationMethod: String,
    val isEnabled: Boolean = true,
    val createdAt: Long = System.currentTimeMillis()
)