From d9ac23d230291d737b67a5bf23ac41dea20778c0 Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期三, 18 十月 2023 11:37:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- server/services/src/main/java/com/doumee/dao/business/model/MqttLog.java | 1 - 1 files changed, 0 insertions(+), 1 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 2bc4425..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 @@ -45,7 +45,6 @@ @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1") @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�") - @TableLogic private Integer isdeleted; @ApiModelProperty(value = "澶囨敞") -- Gitblit v1.9.3