From 6f9623981926d78ce8ccd80bce55ad631bd2c76b Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期四, 27 三月 2025 17:16:13 +0800
Subject: [PATCH] fix: 计划合并提交

---
 platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 54 insertions(+), 3 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 aefe50f..5ab650a 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,16 +31,17 @@
 	/**
 	 * 楠屾敹涓昏〃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 '鏁伴噺'")
+	@Column(columnDefinition="bigint comment '鏁伴噺'")
 	private Long num;
 
 	/**
@@ -48,6 +51,54 @@
 	@Column(columnDefinition="double comment '楠屾敹閲戦'")
 	private Double output;
 
+	/**
+	 * 璁惧ID
+	 */
+	@Schema(description="璁惧ID")
+	@Column(columnDefinition="bigint comment '璁惧ID'")
+	private Long deviceId;
+
+	/**
+	 * 璁惧缂栫爜
+	 */
+	@Schema(description="璁惧缂栫爜")
+	@Column(columnDefinition="VARCHAR(16) comment '璁惧缂栫爜'")
+	private String deviceCode;
+
+	/**
+	 * 璁惧鍚嶇О
+	 */
+	@Schema(description="璁惧鍚嶇О")
+	@Column(columnDefinition="VARCHAR(256) comment '璁惧鍚嶇О'")
+	private String deviceName;
+
+	/**
+	 * 瑙勬牸鍨嬪彿
+	 */
+	@Schema(description="瑙勬牸鍨嬪彿")
+	@Column(columnDefinition="VARCHAR(256) comment '瑙勬牸鍨嬪彿'")
+	private String deviceModels;
+
+	/**
+	 * 鍏抽敭鍙傛暟
+	 */
+	@Schema(description="鍏抽敭鍙傛暟")
+	@Column(columnDefinition="VARCHAR(256) comment '鍏抽敭鍙傛暟'")
+	private String keyParameter;
 
 
+	/**
+	 * 璁￠噺鍗曚綅
+	 */
+	@Schema(description="璁￠噺鍗曚綅")
+	@Column(columnDefinition="VARCHAR(32) comment '璁￠噺鍗曚綅'")
+	private String meteringUnit;
+
+	/**
+	 * 鍏ュ簱鏃舵墍闇�搴忓垪鍙�
+	 */
+	@Schema(description = "璁惧搴忓垪鍙�")
+	@Transient
+	@TableField(exist = false)
+	private List<String> serialNos;
 }

--
Gitblit v1.9.1