From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java |   87 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 85 insertions(+), 2 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..ad42551 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
@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 鍚堝苟鎶曚繚鍗曚俊鎭〃
@@ -33,7 +34,6 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -42,7 +42,6 @@
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -105,8 +104,92 @@
     @ExcelColumn(name="鏂规缂栫爜锛堝叧鑱攕olutions锛�")
     private Integer solutionId;
 
+    @ApiModelProperty(value = "鍟嗘埛鍚嶇О", example = "1")
+    @TableField(exist = false)
+    private String companyName;
+    @ApiModelProperty(value = "琚繚闄╀汉浼佷笟鍚嶇О ,鍒嗗壊")
+    @TableField(exist = false)
+    private String companyNames;
+
     @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;
+
+    @ApiModelProperty(value = "鎶曚繚浜烘暟")
+    @TableField(exist = false)
+    private Integer insureNum;
+    @ApiModelProperty(value = "鐘舵�佸悕绉�")
+    @TableField(exist = false)
+    private String statusInfo;
+
+    @ApiModelProperty(value = "鏈�浣庡勾榫�", example = "1")
+    @TableField(exist = false)
+    private Integer minAge;
+
+    @ApiModelProperty(value = "鏈�楂樺勾榫�", example = "1")
+    @TableField(exist = false)
+    private Integer maxAge;
+
+    @ApiModelProperty(value = "淇濋櫓璐圭敤(浜�/澶╋級", example = "1")
+    @TableField(exist = false)
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "淇濋櫓鏃堕棿鍗曚綅0澶� 1鍗婃湀 2鏈� 3骞�", example = "1")
+    @TableField(exist = false)
+    private Integer timeUnit;
+
+    @ApiModelProperty(value = "鐗瑰埆绾﹀畾")
+    @TableField(exist = false)
+    private String specialAgreement;
+
+    @ApiModelProperty(value = "鐗瑰埆璇存槑")
+    @TableField(exist = false)
+    private String specialInfo;
+
+    @ApiModelProperty(value = "鍏朵粬璇存槑")
+    @TableField(exist = false)
+    private String ortherInfo;
+
+
+    @ApiModelProperty(value = "鍔犲噺淇濈敵璇锋暟閲�", example = "1")
+    @TableField(exist = false)
+    private Integer addApplyNum;
+
+    @ApiModelProperty(value = "鎹㈠巶鐢宠鏁伴噺", example = "1")
+    @TableField(exist = false)
+    private Integer changeApplyNum;
+
+
+
+    @ApiModelProperty(value = "鏃ュ織璁板綍")
+    @TableField(exist = false)
+    private List<ApplyLog> applyLogList;
+
+    @ApiModelProperty(value = "浜哄憳淇℃伅")
+    @TableField(exist = false)
+    private List<ApplyDetail> applyDetailList;
+
+    @ApiModelProperty(value = "鎶曚繚鍗曞璞�")
+    @TableField(exist = false)
+    private Multifile toubaodanFile;
+    @ApiModelProperty(value = "鎶曚繚鍗曪紙宸茬缃诧級瀵硅薄")
+    @TableField(exist = false)
+    private Multifile toubaodanSignedFile;
+    @ApiModelProperty(value = "淇濋櫓鍗曞璞�")
+    @TableField(exist = false)
+    private Multifile baoxiandanFile;
 }

--
Gitblit v1.9.3