From 18e9c3c8c5c05fb14b13d2a30a69af0165496f33 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 31 十月 2024 17:46:10 +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/PlatformGroup.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
index f15c611..1eea899 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -20,7 +21,7 @@
@Data
@ApiModel("鏈堝彴_鍒嗙粍淇℃伅琛�")
@TableName("`platform_group`")
-public class PlatformGroup {
+public class PlatformGroup extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -48,7 +49,19 @@
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
+ @ApiModelProperty(value = "绫诲瀷 1瀹夋嘲鐗╂祦瑁呰揣 0瀹夋嘲鐗╂祦鍗歌揣 2甯傚叕鍙稿嵏璐�", example = "1")
+ @ExcelColumn(name="绫诲瀷 1瀹夋嘲鐗╂祦瑁呰揣 0瀹夋嘲鐗╂祦鍗歌揣 2甯傚叕鍙稿嵏璐�")
+ private Integer type;
+ @ApiModelProperty(value = "宸ヤ綔寮�濮嬫椂闂�")
+ @ExcelColumn(name="宸ヤ綔寮�濮嬫椂闂�")
+ private String startTime;
+ @ApiModelProperty(value = "宸ヤ綔缁撴潫鏃堕棿")
+ @ExcelColumn(name="宸ヤ綔缁撴潫鏃堕棿")
+ private String endTime;
+ @ApiModelProperty(value = "绛夊緟鍙彿鏃堕棿锛堝垎閽燂級")
+ @ExcelColumn(name="绛夊緟鍙彿鏃堕棿锛堝垎閽燂級")
+ private Integer waitCallTime;
@ApiModelProperty(value = "鍚嶇О")
@ExcelColumn(name="鍚嶇О")
private String name;
@@ -68,4 +81,13 @@
@ApiModelProperty(value = "鏈堝彴缁勪笅鐨勬湀鍙�")
@TableField(exist = false)
private List<Platform> platformList;
+
+
+ @ApiModelProperty(value = "浣滀笟涓帓闃熻溅杈�", example = "1")
+ @TableField(exist = false)
+ private List<PlatformJob> workJobList;
+
+ @ApiModelProperty(value = "宸茬鍒版帓闃熻溅杈�", example = "1")
+ @TableField(exist = false)
+ private List<PlatformJob> signJobList;
}
--
Gitblit v1.9.3