From 8f2feb017e56179f756c878cda5056db8286a53b Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 29 三月 2024 10:15:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 b923122..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
@@ -105,8 +105,25 @@
@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