From d764a28d914571e7a6c62d85b6e81e70328ecfdb Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期六, 23 十一月 2024 17:32:51 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractDetail.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractDetail.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractDetail.java index ceb3411..1b265aa 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractDetail.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractDetail.java @@ -1,6 +1,7 @@ package com.doumee.dao.business.model; 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; @@ -19,7 +20,7 @@ @Data @ApiModel("杩愮淮鍚堝悓鏉℃淇℃伅琛�") @TableName("`yw_contract_detail`") -public class YwContractDetail { +public class YwContractDetail extends LoginUserModel { @TableId(type = IdType.AUTO) @ApiModelProperty(value = "涓婚敭", example = "1") @@ -85,6 +86,9 @@ @ApiModelProperty(value = "鎺掑簭鐮�", example = "1") @ExcelColumn(name="鎺掑簭鐮�") private Integer sortnum; + @ApiModelProperty(value = "绫诲瀷 0绉熻祦鏉℃ 1鐗╀笟鏉℃", example = "1") + @ExcelColumn(name="绫诲瀷 0绉熻祦鏉℃ 1鐗╀笟鏉℃") + private Integer type; @ApiModelProperty(value = "鎬婚噾棰�", example = "1") @ExcelColumn(name="鎬婚噾棰�") -- Gitblit v1.9.3