From b0fd64098134466414d22af52baa823245839070 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 31 三月 2025 16:48:18 +0800
Subject: [PATCH] fix: 年度投资计划接口

---
 platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandPlan.java |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandPlan.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandPlan.java
index 0f8736b..fc026bc 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandPlan.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceDemandPlan.java
@@ -22,8 +22,12 @@
 @Entity
 @Table(appliesTo = "device_demand_plan", comment = "璁惧闇�姹傝鍒掍富琛�")
 public class DeviceDemandPlan extends BaseModel<DeviceDemandPlan> {
-	@Schema(description = "璁惧缂栫爜")
-	@Column(columnDefinition="VARCHAR(64) comment '璁惧缂栫爜'")
+
+	@Schema(description = "鍚堝苟璁″垝id")
+	@Column(columnDefinition="long comment '鍚堝苟璁″垝id'")
+	private Long planId;
+	@Schema(description = "缂栫爜")
+	@Column(columnDefinition="VARCHAR(64) comment '缂栫爜'")
 	private String number;
 	@Schema(description = "骞村害")
 	@Column(columnDefinition="int comment '骞村害'")
@@ -31,27 +35,33 @@
 	@Schema(description = "鑱旂郴浜�")
 	@Column(columnDefinition="VARCHAR(64) comment '鑱旂郴浜�'")
 	private String contacts;
-	@Schema(description = "鐢虫姤鐘舵�� 0鐢宠涓紝1浜岀骇鍗曚綅瀹℃牳鎷掔粷  2浜岀骇鍗曚綅瀹℃牳閫氳繃 3闆嗗洟瀹℃牳鎷掔粷 4闆嗗洟瀹℃牳閫氳繃")
+	@Schema(description = "鐢虫姤鐘舵�� 0鐢宠涓紝1浜岀骇鍗曚綅瀹℃牳鎷掔粷  2浜岀骇鍗曚綅瀹℃牳閫氳繃 3寰呴泦鍥㈡壒鍑� 4闆嗗洟瀹℃牳鎷掔粷 5闆嗗洟瀹℃牳閫氳繃")
 	@Column(columnDefinition="int comment '鐢虫姤鐘舵��'")
 	private Integer status;
 	@Schema(description = "鐢虫姤绫诲瀷")
 	@Column(columnDefinition="int comment '鐢虫姤绫诲瀷'")
 	private Integer type;
+
+	@Schema(description = "鎻愪氦绫诲瀷")
+	@Column(columnDefinition="int comment '鎻愪氦绫诲瀷 0鐭挎彁浜� 1瀛愬崟浣嶆彁浜�'")
+	private Integer type2;
 	@Schema(description = "鐢虫姤鍏徃id")
-	@Column(columnDefinition="int comment '鐢虫姤鍏徃id'")
-	private Integer declareCompId;
+	@Column(columnDefinition="long comment '鐢虫姤鍏徃id'")
+	private Long declareCompId;
 	@Schema(description = "鐢虫姤鍏徃")
 	@Column(columnDefinition="VARCHAR(64) comment '鐢虫姤鍏徃'")
 	private String declareCompName;
 	@Schema(description = "濉姤鍏徃id")
-	@Column(columnDefinition="int comment '濉姤鍏徃id'")
-	private Integer releaseCompId;
+	@Column(columnDefinition="long comment '濉姤鍏徃id'")
+	private Long releaseCompId;
 	@Schema(description = "濉姤鍏徃")
 	@Column(columnDefinition="VARCHAR(64) comment '濉姤鍏徃'")
 	private String releaseCompName;
 	@Schema(description = "濉姤浜�")
 	@Column(columnDefinition="VARCHAR(64) comment '濉姤浜�'")
 	private String releasePerson;
+	@Column(columnDefinition = "double(10,2) comment '璁″垝鎬婚'")
+	private Double amount;
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	@Schema(description = "濉姤鏃堕棿")

--
Gitblit v1.9.1