From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期四, 09 十月 2025 11:16:43 +0800 Subject: [PATCH] 优化 --- 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