From a1e19c7466cce45b5bb360e38ab7c7c1753986f2 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 13 一月 2026 15:03:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns
---
cnas-device/src/main/java/com/ruoyi/device/pojo/CollectBridge.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/CollectBridge.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/CollectBridge.java
index 8d65fc2..0e672b4 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/CollectBridge.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/CollectBridge.java
@@ -27,6 +27,9 @@
@ApiModelProperty("濮旀墭缂栧彿")
private String entrustCode;
+ @ApiModelProperty("璁惧缂栧彿")
+ private String deviceCode;
+
@ApiModelProperty("閲囬泦鍊�")
private BigDecimal collectValue;
@@ -39,8 +42,9 @@
@ApiModelProperty("鏈�鍚庝竴娆￠噰闆嗘椂闂�")
private LocalDateTime lastCollectDate;
- public CollectBridge(String entrustCode, BigDecimal collectValue, Double collectTemperature, LocalDateTime firstCollectDate, LocalDateTime lastCollectDate) {
+ public CollectBridge(String entrustCode,String deviceCode, BigDecimal collectValue, Double collectTemperature, LocalDateTime firstCollectDate, LocalDateTime lastCollectDate) {
this.entrustCode = entrustCode;
+ this.deviceCode = deviceCode;
this.collectValue = collectValue;
this.collectTemperature = collectTemperature;
this.firstCollectDate = firstCollectDate;
--
Gitblit v1.9.3