Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

 Conflicts:

	vtm

app/src/main/java/com/navinfo/omqs/bean/EvaluationInfo.kt

@@ -38,8 +38,8 @@ data class EvaluationInfo(
     @SerializedName("problemLink")
     val problemLink: String = "",//问题环节
 
-    @SerializedName("problemReason")
-    val problemReason: String = "",//问题原因
+    @SerializedName("preliminaryAnalysis")
+    val preliminaryAnalysis: String = "",//初步分析
 
     @SerializedName("evaluatorName")
     val evaluatorName: String = "",//测评人名称

app/src/main/java/com/navinfo/omqs/bean/IndoorConnectionInfoBean.kt

@@ -0,0 +1,11 @@
+package com.navinfo.omqs.bean
+
+data class IndoorConnectionInfoBean(
+    var username: String = "",
+    var uname: String = "",
+    var userid: String = "",
+    var token: String = "",
+    var baseurl: String = "",
+    var plate: String = "",
+    var platform: String = "Android",
+)

app/src/main/java/com/navinfo/omqs/bean/QRCodeBean.kt

@@ -0,0 +1,6 @@
+package com.navinfo.omqs.bean
+
+data class QRCodeBean(
+    var errcode: Int = -1,
+    var msg: String = ""
+)