From 400c712a036e97878fe63944ed2cfba303ab178c Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 06 五月 2024 14:23:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Devices.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Devices.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Devices.java
index 08f0d54..0d3630b 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Devices.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Devices.java
@@ -79,6 +79,7 @@
@ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤", example = "1")
@ExcelColumn(name="鐘舵�� 0鍚敤 1绂佺敤")
private Integer status;
+
@ApiModelProperty(value = "蹇冭烦鎺ㄩ�佹椂闂�", example = "1")
@ExcelColumn(name="蹇冭烦鎺ㄩ�佹椂闂�")
private Date heartTime;
--
Gitblit v1.9.3