From 8725ebeaadc6714823593a6b10a0dd9acdf0d14a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 27 五月 2024 17:19:34 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
index 46c455d..39429ee 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
@@ -11,6 +11,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 瀹℃壒淇℃伅璁板綍琛�
@@ -33,7 +34,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@@ -42,7 +42,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -69,8 +68,8 @@
@ExcelColumn(name="ERP瀹℃壒缂栫爜")
private String erpId;
- @ApiModelProperty(value = "瀹℃壒鐘舵�� 0寰呰嚜宸卞鎵瑰鎵� 1寰呰嚜宸卞鎵� 2瀹℃壒閫氳繃 3瀹℃壒鏈�氳繃 4浠栦汉宸插鐞� ", example = "1")
- @ExcelColumn(name="瀹℃壒鐘舵�� 0寰呰嚜宸卞鎵瑰鎵� 1寰呰嚜宸卞鎵� 2瀹℃壒閫氳繃 3瀹℃壒鏈�氳繃 4浠栦汉宸插鐞�")
+ @ApiModelProperty(value = "瀹℃壒鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒鏈�氳繃 4宸插彇娑� 5浠栦汉鎴栫 6浠栦汉鎷掔粷", example = "1")
+ @ExcelColumn(name="瀹℃壒鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒鏈�氳繃 4宸插彇娑� 5浠栦汉鎴栫 6浠栦汉鎷掔粷")
private Integer status;
@ApiModelProperty(value = "鐘舵�佷俊鎭�")
@@ -141,4 +140,9 @@
@TableField(exist = false)
private String companyName;
+
+ @ApiModelProperty(value = "寰呭鎵硅褰�", example = "1")
+ @TableField(exist = false)
+ private List<Approve> approveList;
+
}
--
Gitblit v1.9.3