From 81cacf08b40f18b5f37f322a565297de75932555 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十月 2023 18:13:30 +0800
Subject: [PATCH] aa
---
server/services/src/main/java/com/doumee/dao/business/model/MqttLog.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 abc1d69..17475f1 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,7 +18,11 @@
*/
@Data
@ApiModel("绯荤粺琛屼负鎿嶄綔璁板綍琛�")
-@TableName("`mqtt_log`")
+<<<<<<< HEAD
+@TableName("\"mqtt_log\"")
+=======
+@TableName("mqtt_log")
+>>>>>>> 07088f4225d6c8d21e94cc4981d4c28960f114d8
public class MqttLog {
@ApiModelProperty(value = "缂栫爜")
@@ -73,8 +77,11 @@
@ApiModelProperty(value = "娑堟伅鍐呭")
@ExcelColumn(name="娑堟伅鍐呭")
private String msg;
+ @ApiModelProperty(value = "mqtt娑堟伅绫诲")
+ @ExcelColumn(name="mqtt娑堟伅绫诲")
+ private String msgId;
- @ApiModelProperty(value = "缁撴灉 0鎴愬姛 1澶辫触", example = "1")
+ @ApiModelProperty(value = "缁撴灉 0鎴愬姛 1澶辫触 ", example = "1")
@ExcelColumn(name="缁撴灉 0鎴愬姛 1澶辫触")
private Integer result;
--
Gitblit v1.9.3