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/PlatformGroup.java | 12 +++++++++++- 1 files changed, 11 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 cbd58c9..a82275a 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") @@ -80,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