From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/model/MqttLog.java | 5 -----
1 files changed, 0 insertions(+), 5 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..e528ef3 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 = "缂栫爜")
@@ -49,7 +45,6 @@
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
- @TableLogic
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
--
Gitblit v1.9.3