Merge branch 'master' into dev_arch_opt_3.0

# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
This commit is contained in:
donghongyu
2023-01-16 11:43:46 +08:00
4 changed files with 85 additions and 31 deletions

View File

@@ -2,4 +2,12 @@ package com.mogo.eagle.core.data.msgbox
import java.io.Serializable
data class V2XMsg(var type: String = "", var content: String? = "", var tts: String? = ""): Serializable
data class V2XMsg(var type: String = "", var content: String? = "", var tts: String? = ""): Serializable {
// 临时解决该问题V2XMsg->json作为主键如果主键一样数据条目不会新增
private var timeStamp: Long = 0
init {
timeStamp = System.currentTimeMillis()
}
}