From d2902daad7261ac7d0148dbb9f33f39e52d433f6 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 16 八月 2024 18:15:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 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 ca20201..8063798 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 @@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; import java.math.BigDecimal; +import java.util.List; /** * 鏈堝彴淇℃伅琛� @@ -48,6 +49,7 @@ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�") private Integer isdeleted; + @ApiModelProperty(value = "鍚嶇О") @ExcelColumn(name="鍚嶇О") @@ -162,4 +164,16 @@ @TableField(exist = false) private String broadcaseNames; + @ApiModelProperty(value = "浣滀笟涓帓闃熻溅杈�", example = "1") + @TableField(exist = false) + private List<PlatformJob> workJobList; + + @ApiModelProperty(value = "宸茬鍒版帓闃熻溅杈�", example = "1") + @TableField(exist = false) + private List<PlatformJob> signJobList; + + @ApiModelProperty(value = "閰嶇疆鏄剧ず") + @TableField(exist = false) + private Boolean showConfig = false; + } -- Gitblit v1.9.3