From 541c8aa8d08e4bb758adad33167d1e84943cbfec Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 五月 2024 13:36:47 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 12970c1..c84e8c6 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
@@ -96,11 +96,10 @@
private String signApplyNo;
@ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
@ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
- //鍏ュ弬
-// @DateTimeFormat(pattern = "yyyy-MM-dd")
-// //鍑哄弬
-// @JsonFormat(pattern="yyyy-MM-dd")
private Date validTime;
+ @ApiModelProperty(value = "瀹為檯鍑忎繚鐢熸晥璧锋湡")
+ @ExcelColumn(name="瀹為檯鍑忎繚鐢熸晥璧锋湡")
+ private Date delValidTime;
@ApiModelProperty(value = "鎵瑰崟鍙�")
@ExcelColumn(name="鎵瑰崟鍙�")
@@ -150,6 +149,10 @@
@ApiModelProperty(value = "鎹㈠巶浜烘暟")
@TableField(exist = false)
private Integer changeNum;
+
+ @ApiModelProperty(value = "鏈�鍚庝竴娆″姞鍑忎繚/鎹㈠巶鏃ユ湡")
+ @TableField(exist = false)
+ private Date lastChangeDate;
@ApiModelProperty(value = "鎻愪氦鏃ユ湡寮�濮� yyyy-MM-dd ")
@TableField(exist = false)
@@ -220,6 +223,12 @@
@ApiModelProperty(value = "鏂规绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚")
@TableField(exist = false)
private Integer solutionType;
+
+ @ApiModelProperty(value = "鍚堝苟鍗曚富閿紙淇濆崟锛�")
+ @TableField(exist = false)
+ private Integer unionApplyId;
+
+
public TaxesInvoicingVO toTaxesInvoicingVO(){
TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO();
taxesInvoicingVO.setId(this.getId());
@@ -231,5 +240,7 @@
taxesInvoicingVO.setType(Constants.ONE);
return taxesInvoicingVO;
}
-
+ @ApiModelProperty(value = "鏄惁鑾峰彇闄勪欢淇℃伅 0涓嶉渶瑕� 1闇�瑕�")
+ @TableField(exist = false)
+ private Integer getFiles;
}
--
Gitblit v1.9.3