From 49405039d850c4256b1c3e87fd92c5cdbb08ff72 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 21 五月 2024 09:57:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java index b749443..2f13912 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java @@ -94,6 +94,35 @@ @ExcelColumn(name="鍖哄煙鍚嶇О") private String areaName; + @ApiModelProperty(value = "鐢宠浜哄鍚�", example = "1") + @TableField(exist = false) + private String memberName; + @ApiModelProperty(value = "鐢宠浜烘墍灞炵粍缁囧悕绉�", example = "1") + @TableField(exist = false) + private String companyName; + @ApiModelProperty(value = "鐢宠浜烘墜鏈哄彿", example = "1") + @TableField(exist = false) + private String memberPhone; + @ApiModelProperty(value = "澶勭悊浜哄鍚�", example = "1") + @TableField(exist = false) + private String checkorName; + @ApiModelProperty(value = "澶勭悊浜烘墍灞炵粍缁囧悕绉�", example = "1") + @TableField(exist = false) + private String checkorCompanyName; + @ApiModelProperty(value = "澶勭悊浜烘墜鏈哄彿", example = "1") + @TableField(exist = false) + private String checkorPhone; + @ApiModelProperty(value = "闅愭偅绫诲瀷鍚嶇О", example = "1") + @TableField(exist = false) + private String categoryName; + + @ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂达紙鍩轰簬鎻愭姤鏃堕棿锛�", example = "2024-05-20 11:48:50") + @TableField(exist = false) + private Date queryStartTime; + @ApiModelProperty(value = "鏌ヨ鎴濮嬫椂闂达紙鍩轰簬鎻愭姤鏃堕棿锛�", example = "2024-05-20 11:48:46") + @TableField(exist = false) + private Date queryEndTime; + @ApiModelProperty(value = "鎻愭姤鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date submitTime; -- Gitblit v1.9.3