From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GetThingListMaterialRelationVO.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GetThingListMaterialRelationVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GetThingListMaterialRelationVO.java
index 45e5b5f..22c709a 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GetThingListMaterialRelationVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GetThingListMaterialRelationVO.java
@@ -38,8 +38,11 @@
 	@JsonSerialize(
 		using = ToStringSerializer.class
 	)
-	@ApiModelProperty("主键id")
-	private Long id;
+	/**
+	 * 关联实施清单ID
+	 */
+	@ApiModelProperty(value = "关联实施清单ID")
+	private Long implementListId;
 
 	/**
 	 * 流程定义主键

--
Gitblit v1.9.3