From b85e9515805a88914c5c97de8c312146510d1b4e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 10:38:27 +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/ApplyChange.java | 24 +++++++++++++++++++-----
1 files changed, 19 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 a73def8..591c63c 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="鎵瑰崟鍙�")
@@ -151,6 +150,10 @@
@TableField(exist = false)
private Integer changeNum;
+ @ApiModelProperty(value = "鏈�鍚庝竴娆″姞鍑忎繚/鎹㈠巶鏃ユ湡")
+ @TableField(exist = false)
+ private Date lastChangeDate;
+
@ApiModelProperty(value = "鎻愪氦鏃ユ湡寮�濮� yyyy-MM-dd ")
@TableField(exist = false)
private String createDateS;
@@ -183,6 +186,9 @@
@TableField(exist = false)
private Multifile pidanFile;
+ @ApiModelProperty(value = "鎵瑰噺鏄惁浠呮敮鎸佹浛鎹� 0鍚� 1鏄�", example = "1")
+ @TableField(exist = false)
+ private Integer delOnlyReplace;
@ApiModelProperty(value = "鍔犱繚鏄庣粏鏁版嵁")
@TableField(exist = false)
@@ -224,7 +230,15 @@
@ApiModelProperty(value = "鍚堝苟鍗曚富閿紙淇濆崟锛�")
@TableField(exist = false)
private Integer unionApplyId;
-
+ @ApiModelProperty(value = "骞翠唤")
+ @TableField(exist = false)
+ private Integer year;
+ @ApiModelProperty(value = "缁熻鏉＄洰鏁�")
+ @TableField(exist = false)
+ private Integer countNum;
+ @ApiModelProperty(value = "鎻愪氦鏃ユ湡寮�濮� yyyy-MM ")
+ @TableField(exist = false)
+ private String month;
public TaxesInvoicingVO toTaxesInvoicingVO(){
TaxesInvoicingVO taxesInvoicingVO = new TaxesInvoicingVO();
--
Gitblit v1.9.3