From 3c8fe245e9b43b372eaa8a1bbbb27e5cd4988fe1 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期三, 26 三月 2025 16:48:29 +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 | 8 ++++++-- 1 files changed, 6 insertions(+), 2 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 8d1c79b..400dc1d 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,14 +2,13 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; -import com.doumee.core.model.LoginUserModel; +import com.doumee.service.business.third.model.LoginUserModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; import java.math.BigDecimal; import java.util.Date; @@ -84,6 +83,11 @@ @TableField(exist = false) private List<Platform> platformList; + @ApiModelProperty(value = "杞﹁締绛惧埌寰俊閫氱煡鎺ユ敹浜哄憳涓婚敭澶氫釜浠�,鍒嗗壊") + private String signInNoticeUsers; + + @ApiModelProperty(value = "浣滀笟鏈畬鎴愬井淇¢�氱煡鎺ユ敹浜哄憳涓婚敭澶氫釜浠�,鍒嗗壊") + private String unFinishNoticeUsers; @ApiModelProperty(value = "浣滀笟涓帓闃熻溅杈�", example = "1") @TableField(exist = false) -- Gitblit v1.9.3