From 16f010aadd3ceb3c51fb97c2f6def3f5944fd54c Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 22 十一月 2024 15:52:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java index 023a517..a2faed2 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java @@ -1,6 +1,9 @@ package com.doumee.dao.business.model; +import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; +import com.doumee.core.model.LoginUserModel; +import com.doumee.dao.system.model.Multifile; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -10,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; import java.math.BigDecimal; +import java.util.List; /** * 杩愮淮鍚堝悓淇℃伅琛� @@ -19,7 +23,7 @@ @Data @ApiModel("杩愮淮鍚堝悓淇℃伅琛�") @TableName("`yw_contract`") -public class YwContract { +public class YwContract extends LoginUserModel { @TableId(type = IdType.AUTO) @ApiModelProperty(value = "涓婚敭", example = "1") @@ -147,4 +151,8 @@ @ExcelColumn(name="鐗╀笟璐规�婚噾棰�") private BigDecimal wyTotalFee; + @ApiModelProperty(value = "闄勪欢闆嗗悎") + @TableField(exist = false) + private List<Multifile> fileList; + } -- Gitblit v1.9.3