From a3c4c83e9194efebafe730ef47e121f88d36dd54 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 16:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdThingListMaterialRelVO.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdThingListMaterialRelVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdThingListMaterialRelVO.java
index 3b6c813..8f009c3 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdThingListMaterialRelVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdThingListMaterialRelVO.java
@@ -16,10 +16,10 @@
*/
package org.sxkj.gd.implement.vo;
-import org.sxkj.gd.implement.entity.GdThingListMaterialRelEntity;
-import org.springblade.core.tool.node.INode;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
/**
* 实施清单-材料关联表（情形化配置） 视图实体类
@@ -28,8 +28,29 @@
* @since 2026-01-31
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class GdThingListMaterialRelVO extends GdThingListMaterialRelEntity {
+public class GdThingListMaterialRelVO implements Serializable {
+
private static final long serialVersionUID = 1L;
+ /**
+ * 关联实施清单ID
+ */
+ @ApiModelProperty(value = "关联实施清单ID")
+ private Long implementListId;
+ /**
+ * 关联材料ID
+ */
+ @ApiModelProperty(value = "关联材料ID")
+ private Long materialId;
+ /**
+ * 材料序号（列表展示字段）
+ */
+ @ApiModelProperty(value = "材料序号（列表展示字段）")
+ private Integer sort;
+ /**
+ * 材料情形化配置：{"scenario_name":"情形1","is_need":1,"remark":"仅情形1需提供"}
+ */
+ @ApiModelProperty(value = "材料情形化配置：{\"scenario_name\":\"情形1\",\"is_need\":1,\"remark\":\"仅情形1需提供\"}")
+ private String scenarioConfig;
+
}
--
Gitblit v1.9.3