From a946438f6d69f976c94935f53dd7f326947aba0f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 23 一月 2024 15:17:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java | 23 +++++++++++++++++++++++
1 files changed, 23 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 5d45a24..9395c4c 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
@@ -37,6 +37,19 @@
@ExcelColumn(name="鍒涘缓鏃堕棿")
private Date createDate;
+ @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
+ @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
+
+ private Date checkDate;
+
+ @ApiModelProperty(value = "鏈�杩戞搷浣滃娉�")
+ @ExcelColumn(name="鏈�杩戞搷浣滃娉�")
+ private String checkInfo;
+
+ @ApiModelProperty(value = "鏈�杩戞搷浣滀汉缂栫爜锛堝叧鑱攕ystem_user)", example = "1")
+ @ExcelColumn(name="鏈�杩戞搷浣滀汉缂栫爜锛堝叧鑱攕ystem_user)")
+ private Integer checkUserId;
+
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@@ -87,6 +100,9 @@
@ExcelColumn(name="鎿嶄綔绫诲瀷 0鍔犲噺淇� 1鎹㈠巶")
private Integer type;
+ @ApiModelProperty(value = "鍙樻洿閲戦")
+ @ExcelColumn(name="鍙樻洿閲戦")
+ private BigDecimal fee;
@ApiModelProperty(value = "淇濆崟鍙�")
@TableField(exist = false)
private String applyCode;
@@ -146,4 +162,11 @@
@TableField(exist = false)
private Integer companyId;
+ @ApiModelProperty(value = "鎵瑰崟闄勪欢瀵硅薄")
+ @TableField(exist = false)
+ private Multifile pidanFile;
+ @ApiModelProperty(value = "澶勭悊浼佷笟鐢宠鐘舵�� 0鍚屾剰 1椹冲洖")
+ @TableField(exist = false)
+ private int dealBackApply;
+
}
--
Gitblit v1.9.3