From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 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 99f3efe..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
@@ -12,6 +12,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 杩愮淮璁惧淇℃伅琛�
@@ -94,13 +95,58 @@
@ExcelColumn(name="鎵�鍦ㄤ綅缃�")
private String addr;
+ @ApiModelProperty(value = "鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)", example = "1")
+ private Integer projectId;
+
+ @ApiModelProperty(value = "鎵�灞炴ゼ灞傜紪鐮侊紙鍏宠仈yw_floor)", example = "1")
+ private Integer floorId;
+
+ @ApiModelProperty(value = "鎵�灞炴ゼ瀹囩紪鐮侊紙鍏宠仈yw_building)", example = "1")
+ private Integer buildingId;
+
+ @ApiModelProperty(value = "鎵�灞炴埧闂寸紪鐮侊紙鍏宠仈yw_room)", example = "1")
+ private Integer roomId;
+
+
+ @ApiModelProperty(value = "渚涘簲鍟嗚仈绯讳汉")
+ private String supplierLinker;
+
+ @ApiModelProperty(value = "渚涘簲鍟嗚仈绯荤數璇�")
+ private String supplierPhone;
+
+ @ApiModelProperty(value = "缁翠繚浜哄憳涓婚敭锛堝叧鑱攕ystem_user锛�")
+ private Integer maintenanceUserId;
+
+ @ApiModelProperty(value = "缁翠繚鍒版湡鏃�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date maintenanceOverDate;
+
+ @ApiModelProperty(value = "缁翠繚璇存槑")
+ private String maintenanceContent;
+
+ @ApiModelProperty(value = "璐叆鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date buyDate;
+
@ApiModelProperty(value = "鍒嗙被鍚嶇О")
@TableField(exist = false)
private String categoryName;
+ @ApiModelProperty(value = "鐖剁骇鍒嗙被鍚嶇О")
+ @TableField(exist = false)
+ private String categoryParentName;
+
+ @ApiModelProperty(value = "鎵�灞炵埗绾у垎绫荤紪鐮侊紙鍏宠仈category锛�", example = "1")
+ @TableField(exist = false)
+ private Integer cateParentId;
+
@ApiModelProperty(value = "绠＄悊鍛樺悕绉�")
@TableField(exist = false)
private String realName;
+
+ @ApiModelProperty(value = "缁翠繚浜哄憳鍚嶇О")
+ @TableField(exist = false)
+ private String maintenanceUserName;
@ApiModelProperty(value = "鍥剧墖鍦板潃")
@TableField(exist = false)
@@ -110,6 +156,24 @@
@TableField(exist = false)
private String fileFullUrl;
+ @ApiModelProperty(value = "闄勪欢淇℃伅")
+ @TableField(exist = false)
+ 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 = "闄勪欢淇℃伅")
// @TableField(exist = false)
--
Gitblit v1.9.3