From 7ff92e90d2318f5c2597c4ba01e0cbfde983cec0 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 六月 2026 10:13:35 +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/YwElectrical.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwElectrical.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwElectrical.java
index 45621e9..f64d116 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwElectrical.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwElectrical.java
@@ -134,11 +134,16 @@
@ApiModelProperty("鍏宠仈鍙傛暟妗ｆID priceid鍜宲aram_id 姣忓潡琛ㄥ彧浼氱敤鍏朵腑涓�绉�")
@ExcelColumn(name="鍏宠仈鍙傛暟妗ｆID priceid鍜宲aram_id 姣忓潡琛ㄥ彧浼氱敤鍏朵腑涓�绉�",index=36 ,width=10)
private String paramId;
+ @ApiModelProperty("鐢佃〃鍙傛暟ID锛堝叧鑱� yw_electrical_param.id锛�")
+ private Integer electricalParamId;
@ApiModelProperty("缁戝畾鎴块棿鍚嶇О锛堝叧鑱攜w_electrical_room銆亂w_room锛�")
@TableField(exist = false)
private String roomNames;
@TableField(exist = false)
+ private String paramName;
+
+ @TableField(exist = false)
private String warnTypeName;
@TableField(exist = false)
--
Gitblit v1.9.3