From 39969f50f23ae92c5fc25005d8d367eea0570c31 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 18 十二月 2023 18:21:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java index c4d307b..1bfa566 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java +++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; +import com.doumee.dao.admin.request.OptionsObject; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -11,6 +12,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; import java.math.BigDecimal; +import java.util.List; /** * 璇曢淇℃伅琛� @@ -86,4 +88,7 @@ @ExcelColumn(name="浣跨敤鍦烘櫙 0鍔冲姟浜哄憳 1鏅�氳瀹�") private Integer useType; + @ApiModelProperty(value = "閫夐」闆嗗璞¢泦鍚�") + @TableField(exist = false) + private List<OptionsObject> objectList; } -- Gitblit v1.9.3