From 69fe3de2b3bea4bd6b01e2a7a10caaa8697a7a78 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十一月 2024 11:05:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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..cff24ae 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;
@@ -93,4 +95,15 @@
@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 Multifile multifile;
}
--
Gitblit v1.9.3