From 2edfe17a39cb5aa653318cad9474d18fbdaa204e Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期四, 30 五月 2024 18:23:47 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 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 39429ee..0c89c3b 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 @@ -84,6 +84,9 @@ @ExcelColumn(name="瀹℃壒浜�") private String cheorId; + @ApiModelProperty(value = "瀹℃壒鏃堕棿") + private Date checkDate; + @ApiModelProperty(value = "瀹℃壒浜哄鍚�") @ExcelColumn(name="瀹℃壒浜哄鍚�") private String checkorName; @@ -101,8 +104,8 @@ @ExcelColumn(name="瀹℃壒绛夌骇") private Integer level; - @ApiModelProperty(value = "澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱", example = "1") - @ExcelColumn(name="澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱") + @ApiModelProperty(value = "澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱 2鍗曚汉瀹℃壒", example = "1") + @ExcelColumn(name="澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱 2鍗曚汉瀹℃壒") private Integer approveType; @@ -124,6 +127,9 @@ + @ApiModelProperty(value = "浜鸿劯鍥剧墖", example = "1") + @TableField(exist = false) + private String faceImg; @ApiModelProperty(value = "濮撳悕", example = "1") @ExcelColumn(name="濮撳悕") @@ -141,6 +147,7 @@ private String companyName; + @ApiModelProperty(value = "寰呭鎵硅褰�", example = "1") @TableField(exist = false) private List<Approve> approveList; -- Gitblit v1.9.3