From cb6874174975a370cb60f1557704c9d49a05f9e6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 05 一月 2024 08:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
index 80a50f6..22747d4 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
@@ -61,14 +61,14 @@
@ApiModelProperty(value = "瀹℃壒妯℃澘缂栫爜")
@ExcelColumn(name="瀹℃壒妯℃澘缂栫爜")
- private String templatId;
+ private Integer templatId;
@ApiModelProperty(value = "ERP瀹℃壒缂栫爜")
@ExcelColumn(name="ERP瀹℃壒缂栫爜")
private String erpId;
- @ApiModelProperty(value = "瀹℃壒鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒鏈�氳繃", example = "1")
- @ExcelColumn(name="瀹℃壒鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒鏈�氳繃")
+ @ApiModelProperty(value = "瀹℃壒鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒鏈�氳繃 4浠栦汉宸插鐞�", example = "1")
+ @ExcelColumn(name="瀹℃壒鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒鏈�氳繃 4浠栦汉宸插鐞�")
private Integer status;
@ApiModelProperty(value = "鐘舵�佷俊鎭�")
@@ -103,4 +103,7 @@
@ExcelColumn(name="澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱")
private Integer approveType;
+ @ApiModelProperty(value = "绫诲瀷 0瀹℃壒 1鎶勯��", example = "1")
+ @ExcelColumn(name="绫诲瀷 0瀹℃壒 1鎶勯��")
+ private Integer type;
}
--
Gitblit v1.9.3