From 098386f316ecaa7122bc979809d8160db81304ed Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 06 二月 2025 18:17:26 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java | 20 ++++++++++++++++++++
1 files changed, 20 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 ef14ea2..2d95c9c 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
@@ -124,6 +124,10 @@
@ApiModelProperty(value = "缁翠繚璇存槑")
private String maintenanceContent;
+ @ApiModelProperty(value = "璐叆鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date buyDate;
+
@ApiModelProperty(value = "鍒嗙被鍚嶇О")
@TableField(exist = false)
private String categoryName;
@@ -140,6 +144,10 @@
@TableField(exist = false)
private String realName;
+ @ApiModelProperty(value = "缁翠繚浜哄憳鍚嶇О")
+ @TableField(exist = false)
+ private String maintenanceUserName;
+
@ApiModelProperty(value = "鍥剧墖鍦板潃")
@TableField(exist = false)
private String fileUrl;
@@ -153,6 +161,18 @@
private List<Multifile> multifileList;
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ @TableField(exist = false)
+ private String projectName;
+ @ApiModelProperty(value = "妤煎畤鍚嶇О")
+ @TableField(exist = false)
+ private String buildingName;
+ @ApiModelProperty(value = "妤煎眰鍚嶇О")
+ @TableField(exist = false)
+ private String floorName;
+ @ApiModelProperty(value = "鎴块棿鍚嶇О")
+ @TableField(exist = false)
+ private String roomName;
// @ApiModelProperty(value = "闄勪欢淇℃伅")
--
Gitblit v1.9.3