From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001 From: DYL0109 <dn18191638832@163.com> Date: 星期三, 16 四月 2025 19:20:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev --- zhitan-system/src/main/java/com/zhitan/model/domain/DaqTemplate.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/zhitan-system/src/main/java/com/zhitan/model/domain/DaqTemplate.java b/zhitan-system/src/main/java/com/zhitan/model/domain/DaqTemplate.java index 30df1fa..7c4eba6 100644 --- a/zhitan-system/src/main/java/com/zhitan/model/domain/DaqTemplate.java +++ b/zhitan-system/src/main/java/com/zhitan/model/domain/DaqTemplate.java @@ -25,6 +25,8 @@ @Excel(name = "鍙傛暟缂栫爜") private String code; + @Excel(name = "閲囬泦缂栫爜") + private String gatewayKey; /** * 鍙傛暟鍚嶇О */ @@ -90,4 +92,12 @@ public void setUnit(String unit) { this.unit = unit; } + + public String getGatewayKey() { + return gatewayKey; + } + + public void setGatewayKey(String gatewayKey) { + this.gatewayKey = gatewayKey; + } } -- Gitblit v1.9.3