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 = "备注")
