From e4a06e0730dc0aa6ced97cbb3362d6b8ef473d39 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 27 三月 2025 15:56:34 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java index 3836f49..2bc7807 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java @@ -1,15 +1,17 @@ package com.doumee.dao.business.model; +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; /** * 闅愭偅鍖哄煙閰嶇疆绫诲瀷淇℃伅琛� @@ -32,7 +34,6 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @ExcelColumn(name="鍒涘缓鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") @@ -41,7 +42,6 @@ @ApiModelProperty(value = "鏇存柊鏃堕棿") @ExcelColumn(name="鏇存柊鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") @@ -70,7 +70,7 @@ @ApiModelProperty(value = "瀹夊叏鍛樼紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑", example = "1") @ExcelColumn(name="瀹夊叏鍛樼紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑") - private Integer memberIds; + private String memberIds; @ApiModelProperty(value = "瀹夊叏鍛樺鍚嶉泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑") @ExcelColumn(name="瀹夊叏鍛樺鍚嶉泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑") @@ -79,5 +79,18 @@ @ApiModelProperty(value = "绫诲瀷 0闅愭偅鍖哄煙 1闅愭偅绫诲瀷", example = "1") @ExcelColumn(name="绫诲瀷 0闅愭偅鍖哄煙 1闅愭偅绫诲瀷") private Integer type; + @ApiModelProperty(value = "鐢ㄦ埛缂栫爜闆嗗悎", example = "1") + @TableField(exist = false) + private List<Integer> memberIdList; + + + @ApiModelProperty(value = "璐d换閮ㄩ棬缂栫爜锛堝叧鑱攃ompany锛�", example = "1") +// @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�") + private Integer companyId; + + @ApiModelProperty(value = "璐d换閮ㄩ棬鍚嶇О", example = "1") +// @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�") + @TableField(exist = false) + private String companyName; } -- Gitblit v1.9.3