From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/model/MqttLog.java | 7 +++++--
1 files changed, 5 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..2bc4425 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,7 @@
*/
@Data
@ApiModel("绯荤粺琛屼负鎿嶄綔璁板綍琛�")
-@TableName("`mqtt_log`")
+@TableName("\"mqtt_log\"")
public class MqttLog {
@ApiModelProperty(value = "缂栫爜")
@@ -73,8 +73,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