From 221c873ee48ed5f44680578d32b0bbf19fd9e4c1 Mon Sep 17 00:00:00 2001 From: weimingfei <fei_gaming@sina.com> Date: 星期六, 18 十月 2025 15:23:59 +0800 Subject: [PATCH] 钥匙柜 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 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 27cc358..36a8235 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 @@ -2,14 +2,14 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; -import com.doumee.core.model.LoginUserModel; +import com.doumee.service.business.third.model.LoginUserModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; + import java.util.Date; import java.util.List; @@ -80,9 +80,12 @@ @ExcelColumn(name="瀹℃壒澶囨敞") private String checkInfo; - @ApiModelProperty(value = "瀹℃壒浜�") - @ExcelColumn(name="瀹℃壒浜�") + @ApiModelProperty(value = "瀹為檯瀹℃壒浜�") + @ExcelColumn(name="瀹為檯瀹℃壒浜�") private String cheorId; + + @ApiModelProperty(value = "瀹℃壒鏃堕棿") + private Date checkDate; @ApiModelProperty(value = "瀹℃壒浜哄鍚�") @ExcelColumn(name="瀹℃壒浜哄鍚�") @@ -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; @@ -114,8 +117,8 @@ @ExcelColumn(name="鏄惁淇敼鐩殑鍦� 0鍚� 1鏄�") private Integer addrParam; - @ApiModelProperty(value = "鍏宠仈涓氬姟绫诲瀷锛�0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害", example = "1") - @ExcelColumn(name="鍏宠仈涓氬姟绫诲瀷锛�0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害") + @ApiModelProperty(value = "鍏宠仈涓氬姟绫诲瀷锛�0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害 6鍏ュ洯鍘熷洜", example = "1") + @ExcelColumn(name="鍏宠仈涓氬姟绫诲瀷锛�0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害 6鍏ュ洯鍘熷洜") private Integer objType; @ApiModelProperty(value = "绫诲瀷 0瀹℃壒 1鎶勯��", example = "1") @@ -144,6 +147,11 @@ private String companyName; + @ApiModelProperty(value = "openid", example = "1") + @ExcelColumn(name="openid") + @TableField(exist = false) + private String systemOpenid; + @ApiModelProperty(value = "寰呭鎵硅褰�", example = "1") @TableField(exist = false) -- Gitblit v1.9.3