解决代码冲突

2023-07-14 16:41:39 +08:00
parent 1be2b00bf2
commit eea7cb6fdf
4 changed files with 51 additions and 52 deletions
--- a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/HadLinkDvoBean.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/HadLinkDvoBean.kt
@@ -32,5 +32,9 @@ open class HadLinkDvoBean @JvmOverloads constructor(
    /**
     * 详细属性
     */
-    var linkInfo: LinkInfoBean? = null
+    var linkInfo: LinkInfoBean? = null,
+    /**
+     * 长度（米）
+     */
+    var length: Double = 0.000,
 ) : RealmObject()
--- a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/LinkInfoBean.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/LinkInfoBean.kt
@@ -18,10 +18,7 @@ open class LinkInfoBean @JvmOverloads constructor(
     * 数据的等级
     */
    var dataLevel: Int = 0,
-    /**
-     * 长度（米）
-     */
-    var length: Double = 0.000,
+
    /**
     * 备注信息
     */