From be2d7e7f861e6f5e3568ba13e0f5393d116da3e1 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 31 Jan 2026 17:40:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GetThingListMaterialRelationVO.java |   64 ++++++++++++++++++++++++++++++++
 1 files changed, 64 insertions(+), 0 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
new file mode 100644
index 0000000..22c709a
--- /dev/null
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GetThingListMaterialRelationVO.java
@@ -0,0 +1,64 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.sxkj.gd.implement.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 实施清单主表 视图实体类
+ *
+ * @author Aix
+ * @since 2026-01-31
+ */
+@Data
+public class GetThingListMaterialRelationVO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@JsonSerialize(
+		using = ToStringSerializer.class
+	)
+	/**
+	 * 关联实施清单ID
+	 */
+	@ApiModelProperty(value = "关联实施清单ID")
+	private Long implementListId;
+
+	/**
+	 * 流程定义主键
+	 */
+	@ApiModelProperty(value = "流程定义主键")
+	private String processDefinitionId;
+	/**
+	 * 流程实例主键
+	 */
+	@ApiModelProperty(value = "流程实例主键")
+	private String processInstanceId;
+
+	/**
+	 * 关联材料ID
+	 */
+	@ApiModelProperty(value = "关联材料ids")
+	private List<GdThingListMaterialRelVO> thingListMaterialRels;
+
+}

--
Gitblit v1.9.3