From bc87b51e20a0adf0badf2033ede93cafeb5fc147 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 27 十一月 2024 17:29:59 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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 4b19ee2..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,6 +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;
@@ -18,7 +21,7 @@
@Data
@ApiModel("杩愮淮璁惧淇℃伅琛�")
@TableName("`yw_device`")
-public class YwDevice {
+public class YwDevice extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -65,7 +68,7 @@
@ApiModelProperty(value = "璁惧鍨嬪彿", example = "1")
@ExcelColumn(name="璁惧鍨嬪彿")
- private Integer modelNo;
+ private String modelNo;
@ApiModelProperty(value = "鎵�灞炲垎绫荤紪鐮侊紙绠＄悊category锛�", example = "1")
@ExcelColumn(name="鎵�灞炲垎绫荤紪鐮侊紙绠＄悊category锛�")
@@ -77,8 +80,7 @@
@ApiModelProperty(value = "渚涘簲鍟�")
@ExcelColumn(name="渚涘簲鍟�")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date company;
+ private String supplier;
@ApiModelProperty(value = "杩愮淮鍐呭")
@ExcelColumn(name="杩愮淮鍐呭")
@@ -92,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