From d7dca690cedd12e271f0ee0b9050679d73796f5c Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期一, 06 一月 2025 09:28:10 +0800 Subject: [PATCH] 1 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java index c5da317..99f3efe 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java @@ -1,7 +1,9 @@ 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.dao.system.model.Multifile; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -66,7 +68,7 @@ @ApiModelProperty(value = "璁惧鍨嬪彿", example = "1") @ExcelColumn(name="璁惧鍨嬪彿") - private Integer modelNo; + private String modelNo; @ApiModelProperty(value = "鎵�灞炲垎绫荤紪鐮侊紙绠$悊category锛�", example = "1") @ExcelColumn(name="鎵�灞炲垎绫荤紪鐮侊紙绠$悊category锛�") @@ -78,8 +80,7 @@ @ApiModelProperty(value = "渚涘簲鍟�") @ExcelColumn(name="渚涘簲鍟�") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date company; + private String supplier; @ApiModelProperty(value = "杩愮淮鍐呭") @ExcelColumn(name="杩愮淮鍐呭") @@ -93,4 +94,24 @@ @ExcelColumn(name="鎵�鍦ㄤ綅缃�") private String addr; + @ApiModelProperty(value = "鍒嗙被鍚嶇О") + @TableField(exist = false) + private String categoryName; + + @ApiModelProperty(value = "绠$悊鍛樺悕绉�") + @TableField(exist = false) + private String realName; + + @ApiModelProperty(value = "鍥剧墖鍦板潃") + @TableField(exist = false) + private String fileUrl; + + @ApiModelProperty(value = "鍥剧墖鍦板潃鍏ㄨ矾寰�") + @TableField(exist = false) + private String fileFullUrl; + + +// @ApiModelProperty(value = "闄勪欢淇℃伅") +// @TableField(exist = false) +// private Multifile multifile; } -- Gitblit v1.9.3