From b2bc3eb81485bc7ddb8366477b3483d4f160adaa Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 29 三月 2024 09:17:20 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java b/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java index 0ec7761..3d5f275 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java @@ -1,5 +1,6 @@ package com.doumee.dao.business.model; +import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -62,17 +63,14 @@ @ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡") @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥姝㈡湡") - @JsonFormat(pattern = "yyyy-MM-dd") private Date endTime; @ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡") @ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡") - @JsonFormat(pattern = "yyyy-MM-dd") private Date startTime; @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�") @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�") - @JsonFormat(pattern = "yyyy-MM-dd") private Date checkDate; @ApiModelProperty(value = "鏈�杩戞搷浣滃娉�") @@ -103,4 +101,29 @@ @ExcelColumn(name="鍦ㄧ嚎绛剧珷鍚堝悓鍙�") private String signApplyNo; + @ApiModelProperty(value = "鏂规缂栫爜锛堝叧鑱攕olutions锛�", example = "1") + @ExcelColumn(name="鏂规缂栫爜锛堝叧鑱攕olutions锛�") + private Integer solutionId; + + @ApiModelProperty(value = "鍟嗘埛鍚嶇О", example = "1") + @TableField(exist = false) + private String companyName; + + @ApiModelProperty(value = "鏂规鍚嶇О", example = "1") + @TableField(exist = false) + private String solutionName; + + @ApiModelProperty(value = "鏌ヨ寮�濮嬫棩鏈�", example = "1") + @JsonFormat(pattern = "yyyy-MM-dd") + @TableField(exist = false) + private Date queryStartTime; + + @ApiModelProperty(value = "鏌ヨ缁撴潫鏃ユ湡", example = "1") + @JsonFormat(pattern = "yyyy-MM-dd") + @TableField(exist = false) + private Date queryEndTime; + + @ApiModelProperty(value = "鏈嶅姟澶╂暟") + @TableField(exist = false) + private Integer serviceDays; } -- Gitblit v1.9.3