fix: 解决冲突

2023-04-27 13:37:20 +08:00
parent c4ee38d703 92a9f9d6c4
commit cb0275cee3
16 changed files with 277 additions and 108 deletions
--- a/app/src/main/java/com/navinfo/omqs/bean/TaskBean.kt
+++ b/app/src/main/java/com/navinfo/omqs/bean/TaskBean.kt
@@ -13,7 +13,7 @@ open class TaskBean @JvmOverloads constructor(
    /**
     * 测评任务id
     */
-    @PrimaryKey
+//    @PrimaryKey
    var id: Int = 0,
    /**
     * 测评任务名称