From ef9f580b5dd38d955b153d0010767e58f998ef90 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十月 2023 18:15:33 +0800
Subject: [PATCH] aa
---
server/services/src/main/java/com/doumee/dao/business/model/MqttLog.java | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MqttLog.java b/server/services/src/main/java/com/doumee/dao/business/model/MqttLog.java
index 17475f1..2bc4425 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/MqttLog.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/MqttLog.java
@@ -18,11 +18,7 @@
*/
@Data
@ApiModel("绯荤粺琛屼负鎿嶄綔璁板綍琛�")
-<<<<<<< HEAD
@TableName("\"mqtt_log\"")
-=======
-@TableName("mqtt_log")
->>>>>>> 07088f4225d6c8d21e94cc4981d4c28960f114d8
public class MqttLog {
@ApiModelProperty(value = "缂栫爜")
--
Gitblit v1.9.3