From 851ad4d20985885ab84eabf0635d3398268b9fa4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 31 一月 2024 14:20:25 +0800
Subject: [PATCH] 111

---
 server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
index 558bf6a..051f164 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
@@ -11,6 +11,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -93,6 +94,10 @@
     private String signApplyNo;
     @ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
     @ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
+    //鍏ュ弬
+     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    //鍑哄弬
+    @JsonFormat(pattern="yyyy-MM-dd")
     private Date validTime;
 
     @ApiModelProperty(value = "鎵瑰崟鍙�")
@@ -148,6 +153,10 @@
     @TableField(exist = false)
     private Integer solutionsId;
 
+    @ApiModelProperty(value = "鍩鸿〃淇濋櫓鏂规涓婚敭")
+    @TableField(exist = false)
+    private Integer baseSolutionsId;
+
     @ApiModelProperty(value = "鍔犱繚鏄庣粏鏁版嵁")
     @TableField(exist = false)
     private List<ApplyChagneDetail> addDetailList;
@@ -179,6 +188,9 @@
     @TableField(exist = false)
     private Date endTime;
 
+    @ApiModelProperty(value = "鏃ュ織璁板綍")
+    @TableField(exist = false)
+    private List<ApplyLog> applyLogList;
 
 
 

--
Gitblit v1.9.3