From adf58ddc0337678c2a6770fe8687e54a44998c0d Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 02 四月 2025 15:43:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.java
index bb91a8e..c911c60 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.java
@@ -11,7 +11,9 @@
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.Transient;
import java.util.Date;
+import java.util.List;
/**
* @author kdq
@@ -29,18 +31,18 @@
/**
* 楠屾敹涓昏〃Id
*/
- @Column(columnDefinition="long comment '楠屾敹涓昏〃Id'")
+ @Column(columnDefinition="bigint comment '楠屾敹涓昏〃Id'")
private Long noteId;
/**
* 鍚堝悓Id
*/
- @Column(columnDefinition="long comment '鍚堝悓瀛愰」Id'")
+ @Column(columnDefinition="bigint comment '鍚堝悓瀛愰」Id'")
private Long contractItemId;
@Schema(description = "鏁伴噺")
- @Column(columnDefinition="long comment '鏁伴噺'")
- private Long num;
+ @Column(columnDefinition="integer comment '鏁伴噺'")
+ private Integer num;
/**
* 楠屾敹閲戦
@@ -48,6 +50,13 @@
@TableField("`output`")
@Column(columnDefinition="double comment '楠屾敹閲戦'")
private Double output;
+
+ /**
+ * 璁惧ID
+ */
+ @Schema(description="璁惧ID")
+ @Column(columnDefinition="bigint comment '璁惧ID'")
+ private Long deviceId;
/**
* 璁惧缂栫爜
@@ -85,4 +94,12 @@
@Column(columnDefinition="VARCHAR(32) comment '璁￠噺鍗曚綅'")
private String meteringUnit;
+
+ /**
+ * 璁惧搴忓垪鍙�
+ */
+ @Schema(description="璁惧搴忓垪鍙� 閫楀彿鍒嗛殧")
+ @Column(columnDefinition="VARCHAR(256) comment '璁惧搴忓垪鍙�'")
+ private String serialNos;
+
}
--
Gitblit v1.9.1