From 6ef869b1adcf3a5bb8e4c3117dc507d173f13fd8 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 18 九月 2024 15:19:55 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
index c0e9464..fafc0aa 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
@@ -4,6 +4,7 @@
 import com.doumee.core.annotation.excel.ExcelColumn;
 import com.doumee.core.model.LoginUserInfo;
 import com.doumee.core.model.LoginUserModel;
+import com.doumee.dao.web.response.PlatformWorkVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -93,11 +94,11 @@
 
     @ApiModelProperty(value = "浣滀笟瓒呮椂鎶ヨ鏃堕棿(绉掞級", example = "1")
     @ExcelColumn(name="浣滀笟瓒呮椂鎶ヨ鏃堕棿(绉掞級")
-    private Integer workTimeoutAlermTime;
+    private Integer workTimeoutAlarmTime;
 
     @ApiModelProperty(value = "鍋滅暀瓒呮椂鎶ヨ鏃堕棿(绉掞級", example = "1")
     @ExcelColumn(name="鍋滅暀瓒呮椂鎶ヨ鏃堕棿(绉掞級")
-    private Integer stayTmeoutAlermTime;
+    private Integer stayTimeoutAlarmTime;
 
     @ApiModelProperty(value = "鏈�鍚庝簨浠舵帹閫佹椂闂�")
     @ExcelColumn(name="鏈�鍚庝簨浠舵帹閫佹椂闂�")
@@ -160,13 +161,13 @@
     private String ledIds;
     @ApiModelProperty(value = "鍏宠仈骞挎挱缂栫爜闆嗗悎锛岃嫳鏂囬�楀彿闅斿紑", example = "1")
     @TableField(exist = false)
-    private String broadcaseIds;
+    private String broadcastIds;
     @ApiModelProperty(value = "鍏宠仈LED鍚嶇О闆嗗悎锛岃嫳鏂囬�楀彿闅斿紑", example = "1")
     @TableField(exist = false)
     private String ledNames;
     @ApiModelProperty(value = "鍏宠仈骞挎挱缂栧悕绉伴泦鍚堬紝鑻辨枃閫楀彿闅斿紑", example = "1")
     @TableField(exist = false)
-    private String broadcaseNames;
+    private String broadcastNames;
 
     @ApiModelProperty(value = "浣滀笟涓帓闃熻溅杈�", example = "1")
     @TableField(exist = false)
@@ -180,4 +181,13 @@
     @TableField(exist = false)
     private Boolean showConfig = false;
 
+    @ApiModelProperty(value = "浣滀笟鐘舵�侊細0=绌洪棽锛�1=浣滀笟涓�")
+    @TableField(exist = false)
+    private Integer workStatus;
+
+
+
+    @ApiModelProperty(value = "鏈堝彴浣滀笟鏁版嵁")
+    @TableField(exist = false)
+    private PlatformWorkVO platformWorkVO;
 }

--
Gitblit v1.9.3