From a1647a5152e3d368ec2fb738ca7cc858e220d06c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 24 九月 2024 09:15:08 +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 | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 314f0df..256a013 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;
@@ -101,7 +102,6 @@
@ApiModelProperty(value = "鏈�鍚庝簨浠舵帹閫佹椂闂�")
@ExcelColumn(name="鏈�鍚庝簨浠舵帹閫佹椂闂�")
-
private Date lastEventTime;
@ApiModelProperty(value = "鐩戞帶鐐瑰悕绉帮紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
@@ -157,10 +157,10 @@
private String groupName;
@ApiModelProperty(value = "鍏宠仈LED缂栫爜闆嗗悎锛岃嫳鏂囬�楀彿闅斿紑", example = "1")
@TableField(exist = false)
- private String ledIds;
+ private List<Integer> ledIds;
@ApiModelProperty(value = "鍏宠仈骞挎挱缂栫爜闆嗗悎锛岃嫳鏂囬�楀彿闅斿紑", example = "1")
@TableField(exist = false)
- private String broadcastIds;
+ private List<Integer> broadcastIds;
@ApiModelProperty(value = "鍏宠仈LED鍚嶇О闆嗗悎锛岃嫳鏂囬�楀彿闅斿紑", example = "1")
@TableField(exist = false)
private String ledNames;
@@ -180,4 +180,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